新增根据角色类型获取所有用户接口

sop-business/src/main/java/com/qmth/sop/business/mapper/SysUserRoleMapper.java

@@ -34,10 +34,10 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
     List<SysUserRole> listByRoleId(@Param("roleId") Long roleId);
 
     /**
-     * 根据角色id查询用户信息
+     * 根据角色类型查询用户信息
      *
-     * @param roleId
+     * @param roleType
      * @return
      */
-    List<UserDto> userListByRoleId(Long roleId);
+    List<UserDto> userListByRoleType(@Param("roleType") String roleType);
 }

sop-business/src/main/java/com/qmth/sop/business/service/SysUserRoleService.java

@@ -61,10 +61,10 @@ public interface SysUserRoleService extends IService<SysUserRole> {
     List<SysUserRole> listByRoleId(Long roleId);
 
     /**
-     * 根据角色id查询用户信息
+     * 根据角色类型查询用户信息
      *
-     * @param roleId
+     * @param roleTypeEnum
      * @return
      */
-    List<UserDto> userListByRoleId(Long roleId);
+    List<UserDto> userListByRoleType(RoleTypeEnum roleTypeEnum);
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/SysUserRoleServiceImpl.java

@@ -19,6 +19,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -93,13 +94,13 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
     }
 
     /**
-     * 根据角色id查询用户信息
+     * 根据角色类型查询用户信息
      *
-     * @param roleId
+     * @param roleTypeEnum
      * @return
      */
     @Override
-    public List<UserDto> userListByRoleId(Long roleId) {
-        return this.baseMapper.userListByRoleId(roleId);
+    public List<UserDto> userListByRoleType(RoleTypeEnum roleTypeEnum) {
+        return this.baseMapper.userListByRoleType(Objects.nonNull(roleTypeEnum) ? roleTypeEnum.name() : null);
     }
 }

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -529,8 +529,6 @@ INSERT INTO t_b_product
 (id, name, code, enable, create_id, create_time)
 VALUES(2, '云阅卷', 'CLOUD_MARK', 1, 1, NULL);
 
-INSERT INTO sys_privilege
+INSERT INTO `sop_v1.0.0`.sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(3018, '根据角色id获取所有用户', '/api/admin/common/get_user_list_by_role_id', 'URL', 64, 24, 'SYS', NULL, 1, 1, 0);
-
-
+VALUES(3018, '根据角色类型获取所有用户', '/api/admin/common/get_user_list_by_role_type', 'URL', 64, 24, 'SYS', NULL, 1, 1, 0);

sop-business/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -17,13 +17,14 @@
         </where>
     </select>
 
-    <select id="userListByRoleId" resultType="com.qmth.sop.business.bean.dto.UserDto">
+    <select id="userListByRoleType" resultType="com.qmth.sop.business.bean.dto.UserDto">
         select su.*,so.name as orgName from sys_user su
         join sys_user_role sur on su.id = sur.user_id
         join sys_org so on so.id = su.org_id
+        join sys_role sr on sr.id = sur.role_id
         <where>
-            <if test="roleId != null and roleId != ''">
-                and sur.role_id = #{roleId}
+            <if test="roleType != null and roleType != ''">
+                and sr.type = #{roleType}
             </if>
         </where>
     </select>

sop-common/src/main/java/com/qmth/sop/common/enums/EnumList.java

@@ -23,7 +23,9 @@ public enum EnumList {
 
     FLOW_APPROVE_OPERATION_ENUM(FlowApproveOperationEnum.class),
 
-    FLOW_TASK_TYPE_ENUM(FlowTaskTypeEnum.class);
+    FLOW_TASK_TYPE_ENUM(FlowTaskTypeEnum.class),
+
+    ROLE_TYPE_ENUM(RoleTypeEnum.class);
 
     private Object obj;
 

sop-server/src/main/java/com/qmth/sop/server/api/SysController.java

@@ -285,11 +285,11 @@ public class SysController {
         return ResultUtil.ok(userDtoIPage.getRecords());
     }
 
-    @ApiOperation(value = "根据角色id获取所有用户")
-    @RequestMapping(value = "/get_user_list_by_role_id", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysUser.class)})
-    public Result getUserListByRoleId(@ApiParam(value = "角色id", required = true) @RequestParam Long roleId) {
-        return ResultUtil.ok(sysUserRoleService.userListByRoleId(roleId));
+    @ApiOperation(value = "根据角色类型获取所有用户")
+    @RequestMapping(value = "/get_user_list_by_role_type", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = UserDto.class)})
+    public Result getUserListByRoleType(@ApiParam(value = "角色类型", required = true) @RequestParam RoleTypeEnum roleTypeEnum) {
+        return ResultUtil.ok(sysUserRoleService.userListByRoleType(roleTypeEnum));
     }
 
     @ApiOperation(value = "获取所有机构")
@@ -434,6 +434,12 @@ public class SysController {
                     map.put(flowTaskTypeEnum, flowTaskTypeEnum.getTitle());
                 }
                 break;
+            case ROLE_TYPE_ENUM://角色类型枚举
+                RoleTypeEnum[] roleTypeEnums = RoleTypeEnum.values();
+                for (RoleTypeEnum roleTypeEnum : roleTypeEnums) {
+                    map.put(roleTypeEnum, roleTypeEnum.getTitle());
+                }
+                break;
             default:
                 break;
         }