筹建优化

platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -223,11 +223,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         PageHelper.startPage(pageNum, pageSize);
         UserInfo userInfo = SecurityUtils.getUserInfo();
         // 获取用户角色
-        StringBuilder roleCodes = new StringBuilder();
-        userInfo.getRoleCodes().forEach(item-> {
-            roleCodes.append(item).append(",");
-        });
-        String roles = roleCodes.toString();
+        String roles = getRoleCodes();
         int roleFlag = 1; // 1 申请人 2 执行人 3 部门主管 4 部门负责人
         if(userInfo.getSuperAdmin() != 1){
             record.setDelUserId(userInfo.getUserId());
@@ -804,11 +800,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         PreparationDTO preparationDTO = new PreparationDTO();
         UserInfo userInfo = SecurityUtils.getUserInfo();
         // 获取用户角色
-        StringBuilder roleCodes = new StringBuilder();
-        userInfo.getRoleCodes().forEach(item-> {
-            roleCodes.append(item).append(",");
-        });
-        String roles = roleCodes.toString();
+        String roles = getRoleCodes();
         // 角色标识
         int roleFlag = 1; // 1 申请人 2 执行人 3 部门主管 4 部门负责人
         if(userInfo.getSuperAdmin() != 1){
@@ -996,4 +988,14 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         //SendMessageUtils.sendCommonSms(maps.get("phones"), info);
     }
 
+    private String getRoleCodes(){
+        // 根据用户的角色来定
+        StringBuilder roleCodes = new StringBuilder();
+        List<SysUserRoleVO> roles = sysUserRoleMapper.selectRoleListByUserId(SecurityUtils.getUserInfo().getUserId());
+        roles.forEach(item->{
+            roleCodes.append(item.getRoleCode()).append("&");
+        });
+        return roleCodes.toString();
+    }
+
 }