roleList

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -16,6 +16,7 @@ import org.rcisoft.core.util.UserUtil;
 import org.rcisoft.sys.menu.entity.SysMenu;
 import org.rcisoft.sys.user.bean.CurUser;
 import org.rcisoft.sys.user.dao.SysUserMapper;
+import org.rcisoft.sys.user.dto.QuerySysUserDTO;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.rcisoft.sys.user.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,8 +50,8 @@ public class SysUserController extends PaginationController<SysUser> {
             @ApiImplicitParam(name = "flag", value = "用户启用状态  0未启用  1启用", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "roleName", value = "用户角色", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryUsers")
-    public GridModel queryUsers(CurUser curUser, @Valid SysUser sysUser, BindingResult br) {
-        userServiceImpl.queryUsersByPagination(getPaginationUtility(), sysUser);
+    public GridModel queryUsers(CurUser curUser, @Valid QuerySysUserDTO dto, BindingResult br) {
+        userServiceImpl.queryUsersByPagination(getPaginationUtility(), dto);
         GridModel gridModel = getGridModelResponse();
         return gridModel;
     }

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -3,6 +3,7 @@ package org.rcisoft.sys.user.dao;
 
 import org.apache.ibatis.annotations.*;
 import org.rcisoft.core.base.BaseMapper;
+import org.rcisoft.sys.user.dto.QuerySysUserDTO;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.rcisoft.sys.user.entity.UserRole;
 import org.springframework.stereotype.Repository;
@@ -15,8 +16,7 @@ import java.util.List;
 @Repository
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-
-    @Select("<script>select su.* ,sr.role_name as role_name from s_user  as su " +
+    @Select("<script>select su.* ,sr.role_name as roleList from s_user  as su " +
             "left join s_r_user_role as ru on su.business_id = ru.user_id " +
             "left join s_role as sr on ru.role_id = sr.business_id " +
             "where su.del_flag = 0" +
@@ -24,7 +24,15 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             "<if test=\"roleName!=null and roleName != ''\"> and sr.role_name = #{roleName}</if>" +
             "<if test=\"flag!=null and flag != ''\"> and su.flag = #{flag}</if></script>")
     @ResultMap(value = "BaseResultMap")
-    List<SysUser> queryUsers(SysUser sysUser);
+    List<SysUser> queryUsers(QuerySysUserDTO dto);
+
+    @Select("<script>SELECT sr.role_name AS roleList  " +
+            "FROM s_user AS su " +
+            "LEFT JOIN s_r_user_role AS ru ON su.business_id = ru.user_id " +
+            "LEFT JOIN s_role AS sr ON ru.role_id = sr.business_id  " +
+            "WHERE su.del_flag = 0  " +
+            "AND su.business_id = #{businessId}</script>")
+    List<String> queryRoleByUserId(@Param("businessId") String businessId);
 
     @Update("<script> update s_user set flag = '1' where business_id in" +
             "<foreach item='item' index='index' collection='businessId' open='(' separator=',' close=')'> #{item} </foreach> " +

src/main/java/org/rcisoft/sys/user/dto/QuerySysUserDTO.java

+package org.rcisoft.sys.user.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+@Data
+public class QuerySysUserDTO {
+
+    @ApiModelProperty(value = "用户名（模糊查询条件）")
+    private String name;
+
+    @ApiModelProperty(value = "用户启用状态  0未启用  1启用")
+    private String flag;
+
+    @ApiModelProperty(value = "用户角色")
+    private String roleName;
+
+    @ApiModelProperty(value = "部门（暂时不用）")
+    private String dept;
+
+}

src/main/java/org/rcisoft/sys/user/entity/SysUser.java

@@ -55,9 +55,6 @@ public class SysUser extends IdEntity<SysUser> {
     @Transient
     private String roleId;
 
-    @Transient
-    private String roleName;
-
     @Transient
     private String agencyName;
 

src/main/java/org/rcisoft/sys/user/service/SysUserService.java

@@ -6,6 +6,7 @@ import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.sys.menu.entity.SysMenu;
 import org.rcisoft.sys.user.bean.CurUser;
+import org.rcisoft.sys.user.dto.QuerySysUserDTO;
 import org.rcisoft.sys.user.entity.SysUser;
 
 import java.util.List;
@@ -18,7 +19,7 @@ public interface SysUserService {
     String checkPassword(String userId);
 
 
-    List<SysUser> queryUsersByPagination(PageUtil pageUtil, SysUser sysUser);
+    List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto);
 
     int removeUser(String id);
 

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -10,6 +10,7 @@ import org.rcisoft.sys.menu.dao.SysMenuRepository;
 import org.rcisoft.sys.menu.entity.SysMenu;
 import org.rcisoft.sys.user.bean.CurUser;
 import org.rcisoft.sys.user.dao.SysUserMapper;
+import org.rcisoft.sys.user.dto.QuerySysUserDTO;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.rcisoft.sys.user.entity.UserRole;
 import org.rcisoft.sys.user.service.SysUserService;
@@ -39,8 +40,8 @@ public class SysUserServiceImpl implements SysUserService {
     private Global global;
 
     @Override
-    public List<SysUser> queryUsersByPagination(PageUtil pageUtil, SysUser sysUser) {
-        return sysUserMapper.queryUsers(sysUser);
+    public List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto) {
+        return sysUserMapper.queryUsers(dto);
     }
 
     @Override

src/main/resources/mapper/sys/user/mapper/UserMapper.xml

@@ -18,8 +18,8 @@
         <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
         <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
 <!--        <result column="role_name" property="roleName" jdbcType="VARCHAR" />-->
-        <collection property="roleNameList" ofType="org.rcisoft.business.blesson.entity.BLesson"
-                    javaType="java.util.ArrayList" select="org.rcisoft.business.blesson.dao.BLessonRepository.queryLabelByLessonId"
+        <collection property="roleList" ofType="org.rcisoft.sys.user.entity.SysUser"
+                    javaType="java.util.ArrayList" select="org.rcisoft.sys.user.dao.SysUserMapper.queryRoleByUserId"
                     column="business_id">
         </collection>
     </resultMap>