From a5b599d34b1cbe6f4e84708d1165cce6fb9ef896 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 09 六月 2025 18:06:47 +0800
Subject: [PATCH] zjh20250605
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..a5d0b03 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) {
@@ -896,6 +898,7 @@
}
}
}
+ log.info("type ->{},鏌ヨ鍏宠仈绉戝闆嗗悎 ->{}",type,split);
List<TjOrderRemark> list;
if(null != sysUser && sysUser.getUserName().equals("10001")){
if(type !=1){
@@ -911,6 +914,7 @@
}
}
if (null ==list || list.isEmpty()) {
+ log.info("瑙﹀彂璇ョ瀹や笅鏃犻」鐩�");
return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
}
for (TjOrderRemark tjOrderRemark : list) {
--
Gitblit v1.8.0