From 5a8f3e426736bff2f8678a47d05a3da24af6f470 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 21 五月 2024 18:17:43 +0800
Subject: [PATCH] zjh 2024/05/21-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 72c779d..11d6d05 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
@@ -14,6 +14,7 @@
import com.ltkj.common.core.domain.entity.SysRole;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.core.text.Convert;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.bean.BeanUtils;
import com.ltkj.framework.config.MatchUtils;
@@ -1401,16 +1402,32 @@
}
String config = configService.selectConfigByKey("qt_open_xdt");
+ String byKey = configService.selectConfigByKey("qt_kjksid");
+ List<Integer> split = new ArrayList<>(); // 瀛樻斁杞崲鍚庣殑integer绫诲瀷缁撴灉
if("Y".equals(config)){
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if(null !=roles && roles.size()>0){
List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("鍓嶅彴")).collect(Collectors.toList());
if(list.size()>0){
- ksId=271;
+ if(null !=ksId && ksId==100){
+ ksId=999;
+ }
+ if(null !=byKey && !"".equals(byKey)){
+ String[] arr = byKey.split(","); // 鏍规嵁閫楀彿杩涜鍒囧壊
+ for (String s : arr) {
+ int num = Integer.parseInt(s); // 灏嗘瘡涓瓙瀛楃涓茶浆鎹负integer绫诲瀷
+ split.add(num); // 娣诲姞鍒板垪琛ㄤ腑
+ }
+ }
+ }else {
+ split.add(ksId);
}
+ }else {
+ split.add(ksId);
}
+ }else {
+ split.add(ksId);
}
-
//鍒ゆ柇褰撳墠鐧婚檰鐨勪汉鏄笉鏄鐞嗗憳銆傜鐞嗗憳鍙互鐪嬪綋鍓嶄綋妫�鍙蜂笅鎵�鏈夐」鐩�
// if (sysUser.getUserName().equals("10001")) {
@@ -1430,7 +1447,7 @@
// }
LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
- wq2.eq(TjProject::getDeptId, ksId);
+ wq2.in(TjProject::getDeptId,split);
}
//鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
wq2.eq(TjProject::getNeedReport,"Y");
@@ -1493,7 +1510,10 @@
// }
TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
- List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
+
+// List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
+ List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);
+
if (null == proParentList || proParentList.size()==0) {
Map<String, Object> map = new HashMap<>();
map.put("xiaoJieIds", null);
--
Gitblit v1.8.0