From b9a9957463dc364fec604ebe54651f325233c032 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 16 Oct 2023 21:13:18 +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

---
 .../dxhy/admin/sys/service/impl/SysUserServiceImpl.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 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 948ee077..d81dea0c 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
@@ -352,14 +352,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             user.setUserBusiness(businessList);
             user.setCompanyCodes(companyEntitys);
 //            user.setUserModels(this.getUserCompanyList(userEntity.getCompany()));
+            List<SysUserOrgEntity> orgEntities = sysUserOrgService.queryOrgIdList(userId);
             List<UserModel> userModels = new ArrayList<>();
-            List<SysUserOrgEntity> userOrgEntities = userEntity.getUserOrgEntities();
-            for (SysUserOrgEntity entity : userOrgEntities){
+            for (SysUserOrgEntity entity : orgEntities){
                 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);
-                    }
+                    userModels.add(model);
                 }
             }
             user.setUserModels(userModels);