From fac1cdf5d6d0a16271ff699fa9ce550a13784929 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Thu, 27 May 2021 14:45:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(user):=E6=9F=A5=E8=AF=A2bug=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtSysUserMapper.java     |  1 -
 .../base/mapper/ext/ExtSysUserMapper.xml      |  6 -----
 .../dataease/service/sys/SysUserService.java  | 24 +++++++++++++++----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.java
index 9c957c6b1f..59c52b088e 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.java
@@ -9,6 +9,5 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface ExtSysUserMapper {
-
     List<SysUserGridResponse> query(GridExample example);
 }
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml
index b13fb659f8..a74e5045ff 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml
@@ -44,11 +44,5 @@
         <if test="orderByClause == null">
             order by u.update_time desc
         </if>
-
     </select>
-
-
-
-
-
 </mapper>
diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
index 46f0122243..e7db5dd9cd 100644
--- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java
+++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
@@ -50,12 +50,28 @@ public class SysUserService {
 
 
     public List<SysUserGridResponse> query(BaseGridRequest request) {
+        List<SysUser> sysUsers = sysUserMapper.selectByExample(new SysUserExample());
+        List<SysUserGridResponse> lists = sysUsers.stream().map(ele -> {
+            SysUserGridResponse response = new SysUserGridResponse();
+            BeanUtils.copyBean(response, ele);
+            return response;
+        }).collect(Collectors.toList());
         GridExample gridExample = request.convertExample();
-        List<SysUserGridResponse> lists = extSysUserMapper.query(gridExample);
+        List<SysUserGridResponse> query = extSysUserMapper.query(gridExample);
         lists.forEach(item -> {
-            List<SysUserRole> roles = item.getRoles();
-            List<Long> roleIds = roles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
-            item.setRoleIds(roleIds);
+            for (SysUserGridResponse response : query) {
+                if (item.getUserId().equals(response.getUserId())) {
+                    item.setId(response.getId());
+                    List<SysUserRole> roles = response.getRoles();
+                    item.setRoles(roles);
+                    List<Long> roleIds = roles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
+                    item.setRoleIds(roleIds);
+                    item.setDept(response.getDept());
+                }
+            }
+//            List<SysUserRole> roles = item.getRoles();
+//            List<Long> roleIds = roles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
+//            item.setRoleIds(roleIds);
         });
         return lists;
     }