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 startUserIds = convertList(logInstanceIds, LogReadDO::getStartUserId); List adminUserDOS = adminUserService.getUserList(startUserIds); - // 获得部门信息 - List deptIds = adminUserDOS.stream() - .map(AdminUserDO::getDeptId) - .filter(deptId -> CollectionUtil.isNotEmpty(childDeptIds) && childDeptIds.contains(deptId)) - .distinct() - .collect(Collectors.toList()); + List 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 deptDOS = deptService.getDeptList(deptIds); return BeanUtils.toBean(deptDOS, DeptRespVO.class);