Browse Source

fix 修改角色id为字符串

tjf 3 years ago
parent
commit
e35380951a

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

@@ -114,7 +114,7 @@ public class ExamineScheduleController extends BaseController
                 List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
                 for (ExamineConfig examineConfig : examineConfigs) {
                     for (SysRole role : roles) {
-                        if (examineConfig.getRoleId().equals(role.getRoleId())){
+                        if (examineConfig.getRoleId().equals(String.valueOf(role.getRoleId()))){
                             //有审核权限,判断有没有id
                             Long id = examineSchedule.getId();
                             ColumnNews columnNews = new ColumnNews();
@@ -190,7 +190,7 @@ public class ExamineScheduleController extends BaseController
                 List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
                 for (ExamineConfig examineConfig : examineConfigs) {
                     for (SysRole role : roles) {
-                        if (examineConfig.getRoleId().equals(role.getRoleId())){
+                        if (examineConfig.getRoleId().equals(String.valueOf(role.getRoleId()))){
                             examineSchedule.setExamineLevel(String.valueOf(level-1));
                             ColumnNews columnNews = new ColumnNews();
                             columnNews.setNewsId(examineSchedule.getNewsId());

+ 8 - 8
ruoyi-system/src/main/java/com/ruoyi/system/domain/ExamineConfig.java

@@ -23,7 +23,7 @@ public class ExamineConfig extends BaseEntity
 
     /** 角色ID */
     @Excel(name = "角色ID")
-    private Long roleId;
+    private String roleId;
     /**
      * 角色名称
      */
@@ -59,16 +59,16 @@ public class ExamineConfig extends BaseEntity
     {
         return columnId;
     }
-    public void setRoleId(Long roleId) 
-    {
-        this.roleId = roleId;
-    }
 
-    public Long getRoleId() 
-    {
+    public String getRoleId() {
         return roleId;
     }
-    public void setExamineLevel(String examineLevel) 
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
+    public void setExamineLevel(String examineLevel)
     {
         this.examineLevel = examineLevel;
     }