diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java index 873a9459b..4c2f0a010 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java @@ -119,23 +119,17 @@ public class WorkflowUtils { deptIds.add(Long.valueOf(StringUtils.substringAfter(user.getProcessedBy(), StrUtil.C_COLON))); } } - if (CollUtil.isNotEmpty(userIds)) { - List users = userService.selectListByIds(userIds); - if (CollUtil.isNotEmpty(users)) { - userDTOList.addAll(users); - } + List users = userService.selectListByIds(userIds); + if (CollUtil.isNotEmpty(users)) { + userDTOList.addAll(users); } - if (CollUtil.isNotEmpty(roleIds)) { - List users = userService.selectUsersByRoleIds(roleIds); - if (CollUtil.isNotEmpty(users)) { - userDTOList.addAll(users); - } + List roleUsers = userService.selectUsersByRoleIds(roleIds); + if (CollUtil.isNotEmpty(roleUsers)) { + userDTOList.addAll(roleUsers); } - if (CollUtil.isNotEmpty(deptIds)) { - List users = userService.selectUsersByDeptIds(deptIds); - if (CollUtil.isNotEmpty(users)) { - userDTOList.addAll(users); - } + List deptUsers = userService.selectUsersByDeptIds(deptIds); + if (CollUtil.isNotEmpty(deptUsers)) { + userDTOList.addAll(deptUsers); } } return userDTOList;