✨ 添加查询userSelectData功能

.gitignore

@@ -32,3 +32,4 @@ build/
 .vscode/
 /**/application-hccake.yml
 /**/application-preview.yml
+/aty/

ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java

@@ -15,6 +15,7 @@ import com.hccake.ballcat.admin.modules.sys.service.SysUserService;
 import com.hccake.ballcat.commom.log.operation.annotation.OperationLogging;
 import com.hccake.ballcat.common.core.result.R;
 import com.hccake.ballcat.common.core.result.ResultStatus;
+import com.hccake.ballcat.common.core.vo.SelectData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -57,6 +58,17 @@ public class SysUserController {
         return R.ok(sysUserService.getUserPage(page, qo));
     }
 
+    /**
+     * 获取用户Select
+     *
+     * @return 用户SelectData
+     */
+    @GetMapping("/select")
+    @PreAuthorize("@per.hasPermission('sys_sysuser_read')")
+    public R<List<SelectData>> getSelectData() {
+        return R.ok(sysUserService.getSelectData());
+    }
+
     /**
      * 新增用户
      *

ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java

@@ -2,6 +2,9 @@ package com.hccake.ballcat.admin.modules.sys.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
+import com.hccake.ballcat.common.core.vo.SelectData;
+
+import java.util.List;
 
 /**
  * 系统用户表
@@ -9,4 +12,19 @@ import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
+    /**
+     * 根据RoleCode 查询对应用户
+     * @param roleCode
+     * @return
+     */
+    List<SysUser> selectUsersByRoleCode(String roleCode);
+
+    /**
+     * 返回用户的select数据
+     * name=> username
+     * value => userId
+     *
+     * @return List<SelectData>
+     */
+    List<SelectData> getSelectData();
 }

ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java

@@ -1,8 +1,6 @@
 package com.hccake.ballcat.admin.modules.sys.model.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -85,6 +83,7 @@ private static final long serialVersionUID = 1L;
      * 创建时间
      */
     @ApiModelProperty(value="创建时间")
+    @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
     /**
      * 更新时间

ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java

@@ -7,6 +7,7 @@ import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserScope;
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
 import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.UserInfo;
+import com.hccake.ballcat.common.core.vo.SelectData;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -102,4 +103,19 @@ public interface SysUserService extends IService<SysUser> {
      * @throws IOException
      */
     String updateAvatar(MultipartFile file, Integer userId) throws IOException;
+
+    /**
+     * 根据角色查询用户
+     * @return
+     * @param roleCode
+     */
+    List<SysUser> selectUsersByRoleCode(String roleCode);
+
+    /**
+     * 返回用户的select数据
+     * name=> username
+     * value => userId
+     * @return List<SelectData>
+     */
+    List<SelectData> getSelectData();
 }

ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java

@@ -24,6 +24,7 @@ import com.hccake.ballcat.admin.modules.sys.service.SysPermissionService;
 import com.hccake.ballcat.admin.modules.sys.service.SysUserRoleService;
 import com.hccake.ballcat.admin.modules.sys.service.SysUserService;
 import com.hccake.ballcat.common.core.util.PasswordUtil;
+import com.hccake.ballcat.common.core.vo.SelectData;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -233,5 +234,28 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return objectName;
     }
 
+    /**
+     * 根据角色查询用户
+     *
+     * @return
+     * @param roleCode
+     */
+    @Override
+    public List<SysUser> selectUsersByRoleCode(String roleCode) {
+        return baseMapper.selectUsersByRoleCode(roleCode);
+    }
+
+    /**
+     * 返回用户的select数据
+     * name=> username
+     * value => userId
+     *
+     * @return List<SelectData>
+     */
+    @Override
+    public List<SelectData> getSelectData() {
+        return baseMapper.getSelectData();
+    }
+
 
 }

ballcat-admin/src/main/resources/mapper/sys/SysUserMapper.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hccake.ballcat.admin.modules.sys.mapper.SysUserMapper">
+
+
+	<!-- 通过用户ID查询其关联的角色ID-->
+	<select id="selectUsersByRoleCode" resultType="com.hccake.ballcat.admin.modules.sys.model.entity.SysUser">
+        SELECT
+            	u.user_id,
+				u.username,
+				u.nickname,
+				u.password,
+				u.salt,
+				u.avatar,
+				u.sex,
+				u.email,
+				u.phone,
+				u.status,
+				u.create_time,
+				u.update_time
+        FROM
+       		sys_user u
+		left join
+			sys_user_role ur
+			on u.user_id = ur.user_id
+        left join
+            sys_role r
+		     on r.id = ur.role_id
+        WHERE r.`code` = #{0}
+        and u.del_flag = 0
+    </select>
+
+    <select id="getSelectData" resultType="com.hccake.ballcat.common.core.vo.SelectData">
+		select
+			username as name , user_id as value
+		from
+			sys_user
+		where
+			del_flag = 0
+	</select>
+
+
+</mapper>