From bd3abf9b8101a31e745de1ec76f6d98317b2de2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 十二月 2024 13:50:45 +0800
Subject: [PATCH] 首页流程待办查询接口支持部门

---
 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 3279664..103571d 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -295,14 +295,28 @@
                         }
                         taskVO.setHandlerName(sysUser.getNickName());
                     }
-                    // 缁戝畾鐨勬槸瑙掕壊锛屾煡鍑鸿鑹插悕绉�
+                    // 缁戝畾鐨勬槸瑙掕壊鎴栬�呴儴闂�
                 } else if (StringUtils.isNotBlank(identityLink.getGroupId())) {
-                    SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
-                    if (Objects.nonNull(role)) {
-                        taskVO.setHandlerUnitId(Long.parseLong(identityLink.getGroupId()));
-                        taskVO.setHandlerUnitName("鐢辨嫢鏈夎鑹诧細銆�" + role.getRoleName() + "銆戠殑浜哄鐞�");
-                        taskVO.setHandlerName("鏆傛湭澶勭悊");
-                        taskVO.setHandlerId(null);
+                    if (identityLink.getGroupId().startsWith("dept")) {   // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
+                        String[] split = identityLink.getGroupId().split(":");
+                        if (split.length > 1) {
+                            // 閮ㄩ棬
+                            SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
+                            if (Objects.nonNull(dept)) {
+                                taskVO.setHandlerUnitId(dept.getDeptId());
+                                taskVO.setHandlerUnitName(dept.getDeptName());
+                                taskVO.setHandlerName("鏆傛湭澶勭悊");
+                                taskVO.setHandlerId(null);
+                            }
+                        }
+                    } else {
+                        SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
+                        if (Objects.nonNull(role)) {
+                            taskVO.setHandlerUnitId(Long.parseLong(identityLink.getGroupId()));
+                            taskVO.setHandlerUnitName("鐢辨嫢鏈夎鑹诧細銆�" + role.getRoleName() + "銆戠殑浜哄鐞�");
+                            taskVO.setHandlerName("鏆傛湭澶勭悊");
+                            taskVO.setHandlerId(null);
+                        }
                     }
                 }
             }

--
Gitblit v1.8.0