From eb806b703a33229193541561edb6a5a7d2deec70 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 16 Oct 2023 19:20:12 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E4=BA=BA=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/sys/service/impl/SysUserServiceImpl.java | 14 ++++++++++++--
 .../src/main/resources/mapper/sys/SysUserDao.xml   |  8 ++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
index 0937b7b7..948ee077 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
@@ -351,8 +351,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             user.setUserOrg(userOrgEntity);
             user.setUserBusiness(businessList);
             user.setCompanyCodes(companyEntitys);
-            user.setUserModels(this.getUserCompanyList(userEntity.getCompany()));
-//            user.setUserModels(this.getUserAuthList(String.valueOf(userEntity.getDeptId())));
+//            user.setUserModels(this.getUserCompanyList(userEntity.getCompany()));
+            List<UserModel> userModels = new ArrayList<>();
+            List<SysUserOrgEntity> userOrgEntities = userEntity.getUserOrgEntities();
+            for (SysUserOrgEntity entity : userOrgEntities){
+                List<UserModel> models = this.getUserAuthList(String.valueOf(entity.getDeptId()));
+                for(UserModel model : models) {
+                    if (!userModels.stream().anyMatch(e -> model.getDeptId().equals(e.getDeptId()))) {
+                        userModels.add(model);
+                    }
+                }
+            }
+            user.setUserModels(userModels);
             // 刷新菜单缓存处理
             this.setMetnuRedis(userEntity.getUserId());
             user.setEmailCodes(emailCodes);
diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
index c2054f63..728f260b 100644
--- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
@@ -71,12 +71,16 @@
 
     <select id="getUserAuthList" resultType="com.dxhy.admin.sys.model.UserModel">
         SELECT
-            u.user_id, u.username, u.loginname
+            u.user_id,
+            u.username,
+            u.loginname,
+            u.dept_id
         FROM
             sys_user u
-            INNER JOIN sys_dept d ON u.dept_id = d.dept_id
+            INNER JOIN sys_user_org d ON u.dept_id = d.dept_id
         WHERE
             d.dept_id = #{deptId}
+        group by user_id;
     </select>
 
     <select id="queryUserByEmail" resultType="com.dxhy.admin.sys.entity.SysUserEntity">