From e82352deffd411318697ed542fe72c608f6683cc Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: Tue, 12 Nov 2024 10:31:10 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E5=B7=A5=E5=85=B7=EF=BC=8C=E9=81=BF=E5=85=8D=E5=A4=9A?=
 =?UTF-8?q?=E6=AC=A1=E8=8E=B7=E5=8F=96=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/workflow/utils/WorkflowUtils.java | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

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 9dcb2b6da..df3655160 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
@@ -6,16 +6,17 @@ import com.warm.flow.core.entity.User;
 import com.warm.flow.orm.entity.FlowUser;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.dromara.common.core.domain.dto.RoleDTO;
 import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.service.UserService;
 import org.dromara.common.core.utils.SpringUtils;
-import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.workflow.common.enums.TaskAssigneeEnum;
 
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 工作流工具
@@ -31,12 +32,16 @@ public class WorkflowUtils {
      * @return 权限列表
      */
     public static List<String> permissionList() {
-        List<RoleDTO> roles = LoginHelper.getLoginUser().getRoles();
-        Long deptId = LoginHelper.getDeptId();
-        List<String> permissionList = StreamUtils.toList(roles, role -> TaskAssigneeEnum.ROLE.getCode() + role.getRoleId());
-        permissionList.add(LoginHelper.getUserIdStr());
-        permissionList.add(TaskAssigneeEnum.DEPT.getCode() + deptId);
-        return permissionList;
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        Long deptId = loginUser.getDeptId();
+        //todo 岗位获取待考虑
+        return Stream.concat(
+            loginUser.getRoles().stream().map(role -> TaskAssigneeEnum.ROLE.getCode() + role.getRoleId()),
+            Stream.of(
+                TaskAssigneeEnum.USER.getCode() + loginUser.getUserId(),
+                TaskAssigneeEnum.DEPT.getCode() + deptId
+            )
+        ).collect(Collectors.toList());
     }
 
     /**