From 63148d39e0706cca2d74296ad042fb8e9667a83e Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Fri, 28 Jun 2024 13:58:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserManageServiceImpl.java   | 24 +++++++++----------
 .../mapper/SystemUserRoleRelationMapper.java  |  2 ++
 .../SystemUserRoleRelationServiceImpl.java    |  2 +-
 .../mapper/SystemUserRoleRelationMapper.xml   | 11 +++++++++
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java
index 779028a..2114972 100644
--- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java
+++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java
@@ -124,7 +124,7 @@ public class UserManageServiceImpl implements UserManageService {
         Assert.notEmpty(userInfoReqVo.getDeptId(), "部门不能为空");
         Assert.notEmpty(userInfoReqVo.getRoleIds(), "角色不能为空");
 
-        systemUserService.lambdaUpdate().set(SystemUser::getAccount, userInfoReqVo.getAccount())
+        systemUserService.lambdaUpdate()
                 .set(SystemUser::getUsername, userInfoReqVo.getUsername())
                 .set(SystemUser::getDeptId, userInfoReqVo.getDeptId())
                 .set(SystemUser::getRemark, userInfoReqVo.getRemark())
@@ -155,6 +155,7 @@ public class UserManageServiceImpl implements UserManageService {
         if (StrUtil.isNotEmpty(roleId)){
             userRoleDTOS = userRoleRelationManageService.listUserRole(null, roleId);
         }
+        //构建查询条件
         UserPageQuery userPageQuery = UserPageQuery.builder().userName(userName).deptId(deptId)
                 .excludeUserIdList(userRoleDTOS.stream().map(UserRoleDTO::getUserId).toList()).build();
 
@@ -162,17 +163,16 @@ public class UserManageServiceImpl implements UserManageService {
         if (CollUtil.isEmpty(userInfoPage.getRecords())){
             return userInfoPage;
         }
-        List<SystemRole> systemRoleList = systemRoleService.lambdaQuery()
-                .in(SystemRole::getId, userRoleDTOS.stream().map(UserRoleDTO::getRoleId).toList()).list();
-        if (CollUtil.isNotEmpty(systemRoleList)){
-            return userInfoPage;
-        }
-//        userRoleRelationManageService.listUserRole(null, null)
-//        Map<String, String> roleIdMapName = systemRoleList.stream().collect(Collectors.toMap(SystemRole::getId, SystemRole::getRoleName));
-//        userInfoPage.convert(userInfoDTO -> {
-//            userInfoDTO.setUserRoleList();
-//        })
-        return systemUserService.pageList(userPageQuery, pageNum, pageSize);
+
+        // 填充用户角色
+        List<UserRoleDTO> userRoleDTOList = userRoleRelationManageService.listUserRoleByUserIds(
+                userInfoPage.getRecords().stream().map(UserInfoDTO::getId).toList());
+        Map<String, List<UserRoleDTO>> userIdMapUserRoleDTo = userRoleDTOList.stream().collect(Collectors.groupingBy(UserRoleDTO::getUserId));
+        userInfoPage.convert(userInfoDTO -> {
+            userInfoDTO.setUserRoleList(userIdMapUserRoleDTo.get(userInfoDTO.getId()));
+            return userInfoDTO;
+        });
+        return userInfoPage;
     }
 
     @Override
diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/SystemUserRoleRelationMapper.java b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/SystemUserRoleRelationMapper.java
index afb4da5..cdd7d40 100644
--- a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/SystemUserRoleRelationMapper.java
+++ b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/SystemUserRoleRelationMapper.java
@@ -16,6 +16,8 @@ import java.util.List;
 public interface SystemUserRoleRelationMapper extends BaseMapper<SystemUserRoleRelation> {
 
     List<UserRoleDTO> listUserRole(@Param("userId") String userId, @Param("roleId") String roleId);
+
+    List<UserRoleDTO> listUserRoleByUserIds(List<String> userIds);
 }
 
 
diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/SystemUserRoleRelationServiceImpl.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/SystemUserRoleRelationServiceImpl.java
index 9d8b9cc..d78be1a 100644
--- a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/SystemUserRoleRelationServiceImpl.java
+++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/SystemUserRoleRelationServiceImpl.java
@@ -25,7 +25,7 @@ public class SystemUserRoleRelationServiceImpl extends ServiceImpl<SystemUserRol
 
     @Override
     public List<UserRoleDTO> listUserRoleByUserIds(List<String> userIds) {
-        return null;
+        return  super.getBaseMapper().listUserRoleByUserIds(userIds);
     }
 }
 
diff --git a/know_sub_model/src/main/resources/mapper/SystemUserRoleRelationMapper.xml b/know_sub_model/src/main/resources/mapper/SystemUserRoleRelationMapper.xml
index d508c59..dae3954 100644
--- a/know_sub_model/src/main/resources/mapper/SystemUserRoleRelationMapper.xml
+++ b/know_sub_model/src/main/resources/mapper/SystemUserRoleRelationMapper.xml
@@ -33,4 +33,15 @@
             and ur.user_id = #{userId}
         </if>
     </select>
+    <select id="listUserRoleByUserIds" resultType="com.supervision.knowsub.dto.role.UserRoleDTO">
+        select r.id        as roleId,
+               r.role_name as roleName,
+               ur.user_id  as userId
+        from ks_system_role r
+                 left join ks_system_user_role_relation ur on r.id = ur.role_id
+        where ur.user_id in
+        <foreach collection="userIds" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>