From d76577743763c668a9ebe4ea481e03b62af17596 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 六月 2025 17:46:00 +0800
Subject: [PATCH] zjh20250606
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 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 fbb30fa..3710a7c 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
@@ -165,34 +165,10 @@
return AjaxResult.error("璇疯緭鍏ョ瀹d");
}
//鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
- List<Long> postIds = sysUser.getPostIds();
- List<Long> ksproList = null;
String byKey =null;
-// if (postIds != null) {
-// for (Long postId : postIds) {
-// LambdaQueryWrapper<SysUserPost> wq111 = new LambdaQueryWrapper<>();
-// wq111.eq(SysUserPost::getPostId, postId);
-// SysUserPost one = userPostService.getOne(wq111);
-// if (one != null) {
-// SysPost byId = postService.getById(one.getPostId());
-// if (byId.getPostName().equals("褰曞叆鍛�")) {
-// ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
-// }
-// if (byId.getPostName().equals("鍓嶅彴")) {
-// byKey = configService.selectConfigByKey("qt_kjksid");
-//
-// }
-// }
-// }
-// } else {
-// ksproList = projectService.getKsTjProjectIdList();
-// }
-//
-// if (ksproList == null || ksproList.isEmpty()) {
-// return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
-// }
+ SysDept dept = deptService.getById(ksId);
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if (null != roles && !roles.isEmpty()) {
@@ -208,6 +184,14 @@
if ( StringUtil.isNotBlank(byKey)) {
ksId+=(","+byKey);
}
+
+ if(null !=dept){
+ if(StringUtil.isNotBlank(dept.getSjks())){
+ ksId+=(","+dept.getSjks());
+ }
+ }
+
+
if (type == 0) {
map = deptService.getSysDeptYjWjCustomerList13(ksId, name, tjNumber, 0, page, pageSize);
}
@@ -594,6 +578,7 @@
}
ksId = Math.toIntExact(sysUser.getDeptId());
}
+ SysDept dept = deptService.getById(ksId);
String configByKey = configService.selectConfigByKey("sfkqdyhis");
// 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
@@ -660,6 +645,15 @@
}
}
}
+ if(null !=dept){
+ if(StringUtil.isNotBlank(dept.getSjks())){
+ String[] arr = dept.getSjks().split(","); // 鏍规嵁閫楀彿杩涜鍒囧壊
+ for (String s : arr) {
+ int num = Integer.parseInt(s); // 灏嗘瘡涓瓙瀛楃涓茶浆鎹负integer绫诲瀷
+ split.add(num); // 娣诲姞鍒板垪琛ㄤ腑
+ }
+ }
+ }
log.info("鏌ヨ鍏宠仈绉戝闆嗗悎 ->{}",split);
List<TjOrderRemark> list;
if (null != sysUser && sysUser.getUserName().equals("10001")) {
--
Gitblit v1.8.0