From c3f2b8f9f599e630adc00ba9316b0365bb792e39 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Tue, 12 Nov 2024 22:29:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E4=BC=98=E5=8C=96=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E4=B8=AD=E9=83=A8=E9=97=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 增加对 childDeptIds 是否为空的判断，提高代码健壮性
- 优化部门信息获取逻辑，提高代码可读性和性能
---
 .../worklog/LogInstanceServiceImpl.java       | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
index 5aa3570a..c641c2fc 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
@@ -336,12 +336,22 @@ public class LogInstanceServiceImpl implements LogInstanceService {
         List<Long> startUserIds = convertList(logInstanceIds, LogReadDO::getStartUserId);
         List<AdminUserDO> adminUserDOS = adminUserService.getUserList(startUserIds);
 
-        // 获得部门信息
-        List<Long> deptIds = adminUserDOS.stream()
-                .map(AdminUserDO::getDeptId)
-                .filter(deptId -> CollectionUtil.isNotEmpty(childDeptIds) && childDeptIds.contains(deptId))
-                .distinct()
-                .collect(Collectors.toList());
+        List<Long> deptIds;
+        if (CollectionUtil.isNotEmpty(childDeptIds)) {
+
+            // 获得部门信息
+            deptIds = adminUserDOS.stream()
+                    .map(AdminUserDO::getDeptId)
+                    .filter(childDeptIds::contains)
+                    .distinct()
+                    .collect(Collectors.toList());
+        }else {
+            // 获得部门信息
+            deptIds = adminUserDOS.stream()
+                    .map(AdminUserDO::getDeptId)
+                    .distinct()
+                    .collect(Collectors.toList());
+        }
 
         List<DeptDO> deptDOS = deptService.getDeptList(deptIds);
         return BeanUtils.toBean(deptDOS, DeptRespVO.class);