feat: 查询CSM列表

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -1326,4 +1326,25 @@ public class SysUserController {
 		return R.ok(answerList);
 	}
 
+	/**
+	 * 查询CSM列表
+	 *
+	 * @return {@link R}<{@link ?}>
+	 */
+	@GetMapping("/list-csm")
+	public R<?> listCsm() {
+		UserDTO userDTO = new UserDTO();
+		userDTO.setRole(Stream.of(19).collect(Collectors.toList()));
+		List<UserVO> users = sysUserMapper.listUserByRole(userDTO);
+
+		List<Map<String, Object>> result = users.stream().map(user -> {
+			Map<String, Object> map = new HashMap<>();
+			map.put("userId", user.getUserId());
+			map.put("realname", user.getRealname());
+			return map;
+		}).collect(Collectors.toList());
+
+		return R.ok(result);
+	}
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/SysCsmUserRelation.java

@@ -13,15 +13,15 @@ import lombok.Data;
 @TableName(value ="sys_csm_user_relation")
 @Data
 public class SysCsmUserRelation extends Model<SysCsmUserRelation> {
-    /**
+	private static final long serialVersionUID = 7840785954434505720L;
+	
+	/**
      * csm用户id
      */
-    @TableId(type = IdType.INPUT)
     private Integer userId;
 
     /**
      * 父级用户id
      */
-	@TableId(type = IdType.INPUT)
     private Integer parentId;
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysUserMapper.java

@@ -116,4 +116,12 @@ public interface SysUserMapper extends DataScopeMapper<SysUser> {
 	 * @return 用户信息集合
 	 */
 	List<SysUser> listUserDetails(@Param(value = "userIds") List<Integer> userIds);
+
+	/**
+	 * 按角色查询用户
+	 *
+	 * @param userDTO 用户 DTO
+	 * @return {@link List}<{@link SysUser}> 结果
+	 */
+	List<UserVO> listUserByRole(@Param("query") UserDTO userDTO);
 }

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -744,4 +744,26 @@
 		</where>
 
 	</select>
+
+	<select id="listUserByRole" resultMap="baseResultMap">
+		SELECT
+		distinct
+		u.user_id,
+		u.username,
+		u.realname
+		FROM
+		sys_user  u
+		LEFT JOIN sys_user_role  ur ON ur.user_id = u.user_id
+		<where>
+			u.del_flag = '0'
+			<if test="query.role != null and query.role.size()>0">
+				AND ur.role_id in (
+				<foreach collection="query.role" item="pid" index="index" separator=",">
+					#{pid}
+				</foreach>
+				)
+			</if>
+		</where>
+		ORDER BY u.create_time DESC
+	</select>
 </mapper>