From 05a3443231fd5b4bcd8940324316f3904cc32985 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Thu, 22 Dec 2022 12:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90add=E3=80=91=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  |  8 ++++-
 .../jero/modules/system/entity/SysUser.java   |  3 ++
 .../modules/system/mapper/SysUserMapper.java  | 12 +++++--
 .../system/mapper/xml/SysUserMapper.xml       | 10 +++++-
 .../system/service/ISysUserService.java       |  7 ++++
 .../service/impl/SysUserServiceImpl.java      | 32 +++++++++++++++----
 ...ysUserDepVo.java => SysUserDepNameVo.java} |  2 +-
 .../modules/system/vo/SysUserRoleNameVo.java  | 15 +++++++++
 .../jero/modules/system/vo/SysUserRoleVO.java |  2 +-
 jero-web/src/views/system/UserList.vue        |  6 ++++
 10 files changed, 84 insertions(+), 13 deletions(-)
 rename jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/{SysUserDepVo.java => SysUserDepNameVo.java} (86%)
 create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserRoleNameVo.java

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index 47c90f0b..7b930220 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -114,16 +114,22 @@ public class SysUserController {
 
         IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, queryWrapper);
 
+
 		//批量查询用户的所属部门
         //step.1 先拿到全部的 useids
-        //step.2 通过 useids，一次性查询用户的所属部门名字
         List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
         if(userIds!=null && userIds.size()>0){
+            //step.2 通过 useids，一次性查询用户的所属部门名字
             Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+            //step.3 通过 useids，一次性查询用户的角色名字
+            Map<String,String>  useRoleNames = sysUserService.getRoleNamesByUserIds(userIds);
+            //step.4 遍历赋值
             pageList.getRecords().forEach(item->{
                 item.setOrgCodeTxt(useDepNames.get(item.getId()));
+                item.setRoleTxt(useRoleNames.get(item.getId()));
             });
         }
+
 		result.setSuccess(true);
 		result.setResult(pageList);
 		log.info(pageList.toString());
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
index 6023ec44..fec3ef8e 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
@@ -105,6 +105,9 @@ public class SysUser implements Serializable {
     /**部门名称*/
     private transient String orgCodeTxt;
 
+    /**角色名称*/
+    private transient String roleTxt;
+
     /**
      * 状态(1：正常  2：冻结 ）
      */
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
index 3ab71d3f..64824039 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
@@ -4,11 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.modules.system.vo.SysUserRoleNameVo;
 import org.apache.ibatis.annotations.Param;
 import com.jero.modules.system.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.modules.system.model.SysUserSysDepartModel;
-import com.jero.modules.system.vo.SysUserDepVo;
+import com.jero.modules.system.vo.SysUserDepNameVo;
 
 import java.util.List;
 
@@ -48,7 +49,14 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 * @param userIds
 	 * @return
 	 */
-	List<SysUserDepVo> getDepNamesByUserIds(@Param("userIds")List<String> userIds);
+	List<SysUserDepNameVo> getDepNamesByUserIds(@Param("userIds")List<String> userIds);
+
+	/**
+	 *  根据用户Ids,查询用户角色名称信息
+	 * @param userIds
+	 * @return
+	 */
+	List<SysUserRoleNameVo> getRoleNamesByUserIds(@Param("userIds")List<String> userIds);
 
 	/**
 	 *  根据部门Ids,查询部门下用户信息
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
index c901be15..9fee9d04 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
@@ -36,13 +36,21 @@
 	</select>
 
 	<!-- 查询用户的所属部门名称信息 -->
-	<select id="getDepNamesByUserIds" resultType="com.jero.modules.system.vo.SysUserDepVo">
+	<select id="getDepNamesByUserIds" resultType="com.jero.modules.system.vo.SysUserDepNameVo">
 		select d.depart_name,ud.user_id from sys_user_depart ud,sys_depart d where d.id = ud.dep_id and ud.user_id in
 		<foreach collection="userIds" index="index" item="id" open="(" separator="," close=")">
 			#{id}
 		</foreach>
 	</select>
 
+	<!-- 查询用户的角色名称信息 -->
+	<select id="getRoleNamesByUserIds" resultType="com.jero.modules.system.vo.SysUserRoleNameVo">
+		select r.role_name,ur.user_id from sys_user_role ur,sys_role r where r.id = ur.role_id and ur.user_id in
+		<foreach collection="userIds" index="index" item="id" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</select>
+
 	<!-- 通过多个部门IDS，查询部门下的用户信息 -->
 	<select id="getUserByDepIds" resultType="com.jero.modules.system.entity.SysUser">
 		select * from sys_user where del_flag = 0
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
index 60726f91..b48c8e17 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
@@ -128,6 +128,13 @@ public interface ISysUserService extends IService<SysUser> {
 	 */
 	public Map<String,String> getDepNamesByUserIds(List<String> userIds);
 
+	/**
+	 * 根据 userIds查询，查询用户所属角色的名称（多个角色名逗号隔开）
+	 * @param
+	 * @return
+	 */
+	public Map<String,String> getRoleNamesByUserIds(List<String> userIds);
+
     /**
      * 根据部门 Id 和 QueryWrapper 查询
      *
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index bd3f31e3..abc6e991 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -1,14 +1,11 @@
 package com.jero.modules.system.service.impl;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
-import com.baomidou.mybatisplus.core.conditions.segments.NormalSegmentList;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.system.vo.SysUserRoleNameVo;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CacheConstant;
@@ -24,7 +21,7 @@ import com.jero.modules.system.entity.*;
 import com.jero.modules.system.mapper.*;
 import com.jero.modules.system.model.SysUserSysDepartModel;
 import com.jero.modules.system.service.ISysUserService;
-import com.jero.modules.system.vo.SysUserDepVo;
+import com.jero.modules.system.vo.SysUserDepNameVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
@@ -248,10 +245,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	@Override
 	public Map<String, String> getDepNamesByUserIds(List<String> userIds) {
-		List<SysUserDepVo> list = this.baseMapper.getDepNamesByUserIds(userIds);
+		List<SysUserDepNameVo> userDeplist = this.baseMapper.getDepNamesByUserIds(userIds);
 
 		Map<String, String> res = new HashMap<String, String>();
-		list.forEach(item -> {
+		userDeplist.forEach(item -> {
 					if (res.get(item.getUserId()) == null) {
 						res.put(item.getUserId(), item.getDepartName());
 					} else {
@@ -262,6 +259,27 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return res;
 	}
 
+	/**
+	 * 根据用id列表查出对应的角色名称
+	 * @param userIds
+	 * @return
+	 */
+	@Override
+	public Map<String, String> getRoleNamesByUserIds(List<String> userIds) {
+		List<SysUserRoleNameVo> userRolelist = this.baseMapper.getRoleNamesByUserIds(userIds);
+
+		Map<String, String> res = new HashMap<String, String>();
+		userRolelist.forEach(item -> {
+					if (res.get(item.getUserId()) == null) {
+						res.put(item.getUserId(), item.getRoleName());
+					} else {
+						res.put(item.getUserId(), res.get(item.getUserId()) + "," + item.getRoleName());
+					}
+				}
+		);
+		return res;
+	}
+
 	@Override
 	public IPage<SysUser> getUserByDepartIdAndQueryWrapper(Page<SysUser> page, String departId, QueryWrapper<SysUser> queryWrapper) {
 		LambdaQueryWrapper<SysUser> lambdaQueryWrapper = queryWrapper.lambda();
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserDepVo.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserDepNameVo.java
similarity index 86%
rename from jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserDepVo.java
rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserDepNameVo.java
index 312e56a4..645bbfd0 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserDepVo.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserDepNameVo.java
@@ -9,7 +9,7 @@ import lombok.Data;
  * @Version 1.0
  */
 @Data
-public class SysUserDepVo {
+public class SysUserDepNameVo {
     private String userId;
     private String departName;
 }
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserRoleNameVo.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserRoleNameVo.java
new file mode 100644
index 00000000..aaace6d8
--- /dev/null
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserRoleNameVo.java
@@ -0,0 +1,15 @@
+package com.jero.modules.system.vo;
+
+import lombok.Data;
+
+/**
+ * @Author zer0Black
+ * @Date 2022/12/22 211:58
+ * @Description:
+ * @Version 1.0
+ */
+@Data
+public class SysUserRoleNameVo {
+    private String userId;
+    private String roleName;
+}
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserRoleVO.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserRoleVO.java
index 9ac1ebe8..e7e7f9f6 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserRoleVO.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserRoleVO.java
@@ -9,7 +9,7 @@ import java.util.List;
 public class SysUserRoleVO implements Serializable{
 	private static final long serialVersionUID = 1L;
 
-	/**部门id*/
+	/**角色id*/
 	private String roleId;
 	/**对应的用户id集合*/
 	private List<String> userIdList;
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index 1762d0ea..c7461781 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -272,6 +272,12 @@
             width: 180,
             dataIndex: 'orgCodeTxt'
           },
+          {
+            title: '角色',
+            align: "center",
+            width: 180,
+            dataIndex: 'roleTxt'
+          },
           // {
           //   title: '生日',
           //   align: "center",