From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 03a6400..677fa58 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -181,7 +181,7 @@
ksproList = projectService.getKsTjProjectIdList();
}
- if (ksproList == null || ksproList.size() == 0) {
+ if (ksproList == null || ksproList.isEmpty()) {
return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
}
List<TjCustomer> customerLis = new ArrayList<>();
@@ -822,8 +822,10 @@
@ApiOperation(value = "鍖荤敓鐐瑰嚮浣撴淇℃伅璇︽儏(鍙樉绀虹埗椤圭洰鍒楄〃)")
// 淇敼鎸夌収绉戝鏌ヨ
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber,
- @ApiParam(value = "宸叉鏈鐘舵�� 0 鏈 1宸叉") @RequestParam Integer type) {
+ @ApiParam(value = "宸叉鏈鐘舵�� 0 鏈 1宸叉") @RequestParam(required = false) Integer type) {
+ if(type == null)type= 0;
String userId = SecurityUtils.getLoginUser().getUserId();
+ log.info("褰撳墠鐧诲綍鐢ㄦ埛ID ->{}",userId);
Integer ksId = null;
SysUser sysUser = null;
if (null != userId) {
@@ -858,7 +860,8 @@
AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
- if (sfsf > 0) {
+ int sfsf1 = ltkjJianchajianyanTreeService.getCallSfsfByCardId(tjOrder.getCardId());
+ if (sfsf > 0 || sfsf1 > 0) {
log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� " + sfsf);
log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
@@ -896,6 +899,7 @@
}
}
}
+ log.info("type ->{},鏌ヨ鍏宠仈绉戝闆嗗悎 ->{}",type,split);
List<TjOrderRemark> list;
if(null != sysUser && sysUser.getUserName().equals("10001")){
if(type !=1){
@@ -911,6 +915,7 @@
}
}
if (null ==list || list.isEmpty()) {
+ log.info("瑙﹀彂璇ョ瀹や笅鏃犻」鐩�");
return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
}
for (TjOrderRemark tjOrderRemark : list) {
--
Gitblit v1.8.0