fix 修改角色id为字符串

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ColumnNewsController.java

@@ -104,9 +104,9 @@ public class ColumnNewsController extends BaseController
     {
         return toAjax(columnNewsService.deleteColumnNewsByNewsIds(newsIds));
     }
-    /**
+/*    *//**
      * 文章审核通过
-     */
+     *//*
     @PreAuthorize("@ss.hasPermi('system:news:examine')")
     @Log(title = "文章信息", businessType = BusinessType.EXAMINE)
     @GetMapping(value = "/examine/{newsId}")
@@ -114,9 +114,9 @@ public class ColumnNewsController extends BaseController
     {
         return toAjax(columnNewsService.examineColumnNews(newsId));
     }
-    /**
+    *//**
      * 驳回文章信息
-     */
+     *//*
     @PreAuthorize("@ss.hasPermi('system:news:reject')")
     @Log(title = "驳回文章信息", businessType = BusinessType.REJECT)
     @PostMapping("/reject")
@@ -125,5 +125,5 @@ public class ColumnNewsController extends BaseController
         //驳回
         columnNews.setStatus("2");
         return toAjax(columnNewsService.updateColumnNews(columnNews));
-    }
+    }*/
 }

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

@@ -24,6 +24,11 @@ public class ExamineConfig extends BaseEntity
     /** 角色ID */
     @Excel(name = "角色ID")
     private String roleId;
+
+    /**
+     * 角色ID数组
+     */
+    private int[] roleIds;
     /**
      * 角色名称
      */
@@ -33,6 +38,14 @@ public class ExamineConfig extends BaseEntity
     @Excel(name = "审批等级")
     private String examineLevel;
 
+    public int[] getRoleIds() {
+        return roleIds;
+    }
+
+    public void setRoleIds(int[] roleIds) {
+        this.roleIds = roleIds;
+    }
+
     public String getRoleName() {
         return roleName;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ColumnNewsServiceImpl.java

@@ -128,6 +128,7 @@ public class ColumnNewsServiceImpl implements IColumnNewsService
      */
     @Override
     public int examineColumnNews(Integer newsId) {
+        //查看这个人是否有审核权限
         return columnNewsMapper.examineColumnNews(newsId);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ExamineConfigServiceImpl.java

@@ -1,14 +1,22 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.ExamineConfig;
 import com.ruoyi.system.mapper.ExamineConfigMapper;
+import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.service.IExamineConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
 
 /**
  * 审核角色配置Service业务层处理
@@ -21,6 +29,9 @@ public class ExamineConfigServiceImpl implements IExamineConfigService {
     @Autowired
     private ExamineConfigMapper examineConfigMapper;
 
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
     /**
      * 查询审核角色配置
      *
@@ -29,7 +40,25 @@ public class ExamineConfigServiceImpl implements IExamineConfigService {
      */
     @Override
     public ExamineConfig selectExamineConfigById(Long id) {
-        return examineConfigMapper.selectExamineConfigById(id);
+        ExamineConfig examineConfig = examineConfigMapper.selectExamineConfigById(id);
+        String roleId = examineConfig.getRoleId();
+        if (StringUtils.isNotBlank(roleId)) {
+            List<Integer> arr = new ArrayList<>();
+            String[] split = roleId.split(",");
+            StringBuilder sb = new StringBuilder();
+            if (split.length > 0){
+
+                for (String roleIds : split) {
+                    SysRole sysRole = sysRoleMapper.selectRoleById(Long.valueOf(roleIds));
+                    String roleName = sysRole.getRoleName();
+                    sb.append(roleName).append("|");
+                    arr.add(Integer.valueOf(roleIds));
+                }
+            }
+            examineConfig.setRoleName(sb.toString());
+            examineConfig.setRoleIds(arr.stream().mapToInt(Integer::valueOf).toArray());
+        }
+        return examineConfig;
     }
 
     /**
@@ -40,7 +69,30 @@ public class ExamineConfigServiceImpl implements IExamineConfigService {
      */
     @Override
     public List<ExamineConfig> selectExamineConfigList(ExamineConfig examineConfig) {
-        return examineConfigMapper.selectExamineConfigList(examineConfig);
+
+        List<ExamineConfig> examineConfigs = examineConfigMapper.selectExamineConfigList(examineConfig);
+        if (examineConfigs.size() > 0) {
+            for (ExamineConfig config : examineConfigs) {
+                String roleId = config.getRoleId();
+
+                if (StringUtils.isNotBlank(roleId)) {
+                    String[] split = roleId.split(",");
+                    List<Integer> arr = new ArrayList<>();
+                    StringBuilder sb = new StringBuilder();
+                    if (split.length > 0){
+                        for (String id : split) {
+                            SysRole sysRole = sysRoleMapper.selectRoleById(Long.valueOf(id));
+                            String roleName = sysRole.getRoleName();
+                            sb.append(roleName).append("|");
+                            arr.add(Integer.valueOf(id));
+                        }
+                    }
+                    config.setRoleName(sb.toString());
+                    config.setRoleIds(arr.stream().mapToInt(Integer::valueOf).toArray());
+                }
+            }
+        }
+        return examineConfigs;
     }
 
     /**
@@ -51,6 +103,18 @@ public class ExamineConfigServiceImpl implements IExamineConfigService {
      */
     @Override
     public int insertExamineConfig(ExamineConfig examineConfig) {
+        int[] roleIds = examineConfig.getRoleIds();
+        if (roleIds.length > 0) {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < roleIds.length; i++) {
+                if (i == roleIds.length - 1) {
+                    sb.append(roleIds[i]);
+                } else {
+                    sb.append(roleIds[i]).append(",");
+                }
+            }
+            examineConfig.setRoleId(sb.toString());
+        }
         examineConfig.setCreateTime(DateUtils.getNowDate());
         return examineConfigMapper.insertExamineConfig(examineConfig);
     }
@@ -63,6 +127,18 @@ public class ExamineConfigServiceImpl implements IExamineConfigService {
      */
     @Override
     public int updateExamineConfig(ExamineConfig examineConfig) {
+        int[] roleIds = examineConfig.getRoleIds();
+        if (roleIds.length > 0) {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < roleIds.length; i++) {
+                if (i == roleIds.length - 1) {
+                    sb.append(roleIds[i]);
+                } else {
+                    sb.append(roleIds[i]).append(",");
+                }
+            }
+            examineConfig.setRoleId(sb.toString());
+        }
         examineConfig.setUpdateTime(DateUtils.getNowDate());
         return examineConfigMapper.updateExamineConfig(examineConfig);
     }

ruoyi-system/src/main/resources/mapper/system/ExamineConfigMapper.xml

@@ -18,8 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectExamineConfigVo">
-        select c.id, c.column_id, c.role_id, c.examine_level, c.create_by, c.create_time, c.update_by, c.update_time, c.remark,r.role_name from examine_config c left join sys_role r
-        on c.role_id = r.role_id
+        select c.id, c.column_id, c.role_id, c.examine_level, c.create_by, c.create_time, c.update_by, c.update_time, c.remark from examine_config c
     </sql>
 
     <select id="selectExamineConfigList" parameterType="ExamineConfig" resultMap="ExamineConfigResult">