Browse Source

fix 修改角色id为字符串

tjf 3 năm trước cách đây
mục cha
commit
9d5599512c

+ 5 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ExamineScheduleController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -114,7 +115,8 @@ public class ExamineScheduleController extends BaseController
                 List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
                 for (ExamineConfig examineConfig : examineConfigs) {
                     for (SysRole role : roles) {
-                        if (examineConfig.getRoleId().equals(String.valueOf(role.getRoleId()))){
+                        String[] split = examineConfig.getRoleId().replace("[", "").replace("]", "").split(",");
+                        if (Arrays.asList(split).contains(String.valueOf(role.getRoleId()))){
                             //有审核权限,判断有没有id
                             Long id = examineSchedule.getId();
                             ColumnNews columnNews = new ColumnNews();
@@ -190,7 +192,8 @@ public class ExamineScheduleController extends BaseController
                 List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
                 for (ExamineConfig examineConfig : examineConfigs) {
                     for (SysRole role : roles) {
-                        if (examineConfig.getRoleId().equals(String.valueOf(role.getRoleId()))){
+                        String[] split = examineConfig.getRoleId().replace("[", "").replace("]", "").split(",");
+                        if (Arrays.asList(split).contains(String.valueOf(role.getRoleId()))){
                             examineSchedule.setExamineLevel(String.valueOf(level-1));
                             ColumnNews columnNews = new ColumnNews();
                             columnNews.setNewsId(examineSchedule.getNewsId());

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: druid
+    active: prod