From ac544c1d85c53e7f51e4ea76aa2489a14aef03d9 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 六月 2025 18:57:45 +0800
Subject: [PATCH] zjh20250620

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java |   61 +++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 23 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 fa4586a..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
@@ -153,48 +153,50 @@
                                  @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
                                  @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
         String userId = SecurityUtils.getLoginUser().getUserId();
-        Integer ksId = null;
+        String ksId = null;
         SysUser sysUser = null;
         if (null != userId) {
             sysUser = userService.getById(Long.valueOf(userId));
             if (null != sysUser) {
-                ksId = Math.toIntExact(sysUser.getDeptId());
+                ksId = sysUser.getDeptId().toString();
             }
         }
         if (ksId == null) {
             return AjaxResult.error("璇疯緭鍏ョ瀹d");
         }
         //鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
-        List<Long> postIds = sysUser.getPostIds();
-        List<Long> ksproList = 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));
-                    }
-                }
+
+        String byKey =null;
+
+        SysDept dept = deptService.getById(ksId);
+
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        if (null != roles && !roles.isEmpty()) {
+            List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("鍓嶅彴")).collect(Collectors.toList());
+            if (!list.isEmpty()) {
+                byKey = configService.selectConfigByKey("qt_kjksid");
             }
-        } else {
-            ksproList = projectService.getKsTjProjectIdList();
         }
 
-        if (ksproList == null || ksproList.isEmpty()) {
-            return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
-        }
-        List<TjCustomer> customerLis = new ArrayList<>();
         if (null == name) name = "";
         if (null == tjNumber) tjNumber = "";
         Map<String, Object> map = null;
+        if ( StringUtil.isNotBlank(byKey)) {
+            ksId+=(","+byKey);
+        }
+
+        if(null !=dept){
+            if(StringUtil.isNotBlank(dept.getSjks())){
+                ksId+=(","+dept.getSjks());
+            }
+        }
+
+
         if (type == 0) {
-            map = deptService.getSysDeptYjWjCustomerList13(String.valueOf(ksId), name, tjNumber, 0, page, pageSize);
+            map = deptService.getSysDeptYjWjCustomerList13(ksId, name, tjNumber, 0, page, pageSize);
         }
         if (type == 1) {
-            map = deptService.getSysDeptYjWjCustomerList13(String.valueOf(ksId), name, tjNumber, 1, page, pageSize);
+            map = deptService.getSysDeptYjWjCustomerList13(ksId, name, tjNumber, 1, page, pageSize);
         }
         return AjaxResult.success(map);
 
@@ -566,6 +568,7 @@
 //    淇敼鎸夌収绉戝鏌ヨ
     public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
         String userId = SecurityUtils.getLoginUser().getUserId();
+        log.info("褰撳墠鐧诲綍鐢ㄦ埛ID ->{}",userId);
         Integer ksId = null;
         SysUser sysUser = null;
         if (null != userId) {
@@ -575,6 +578,7 @@
             }
             ksId = Math.toIntExact(sysUser.getDeptId());
         }
+        SysDept dept = deptService.getById(ksId);
         String configByKey = configService.selectConfigByKey("sfkqdyhis");
         // 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
         TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
@@ -641,6 +645,16 @@
                 }
             }
         }
+        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")) {
             list = remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
@@ -648,6 +662,7 @@
             list = remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
         }
         if (null == list || list.isEmpty()) {
+            log.info("瑙﹀彂璇ョ瀹や笅鏃犻」鐩�");
             return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
         }
         for (TjOrderRemark tjOrderRemark : list) {

--
Gitblit v1.8.0