From 30440cde8f2590e75aed05cd4de6e6e19ba4fb10 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 17 Oct 2023 16:06:11 +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

---
 .../sys/service/impl/SysUserServiceImpl.java  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 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 fab7c630..c6f0ed6f 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
@@ -357,23 +357,23 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             for (SysDeptEntity entity : deptEntities){
                 List<UserModel> models = this.getUserAuthList(String.valueOf(entity.getDeptId()));
                 for(UserModel model : models) {
-                    if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()))) {
+                    if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDeptId()))) {
                         userModels.add(model);
                     }
                 }
             }
 
-            //增加当前登录用户选中的数据
-            for (SysDeptEntity entity : deptEntities){
-                UserModel userModel = new UserModel();
-                userModel.setUserId(String.valueOf(user.getUserId()));
-                userModel.setUsername(user.getUsername());
-                userModel.setLoginname(user.getLoginname());
-                userModel.setDeptId(String.valueOf(entity.getDeptId()));
-                if(userModels.stream().noneMatch(e -> userModel.getUserId().equals(e.getUserId()) && userModel.getDeptId().equals(e.getDeptId()) )) {
-                    userModels.add(userModel);
-                }
-            }
+//            //增加当前登录用户选中的数据
+//            for (SysDeptEntity entity : deptEntities){
+//                UserModel userModel = new UserModel();
+//                userModel.setUserId(String.valueOf(user.getUserId()));
+//                userModel.setUsername(user.getUsername());
+//                userModel.setLoginname(user.getLoginname());
+//                userModel.setDeptId(String.valueOf(entity.getDeptId()));
+//                if(userModels.stream().noneMatch(e -> userModel.getUserId().equals(e.getUserId()) && userModel.getDeptId().equals(e.getDeptId()) )) {
+//                    userModels.add(userModel);
+//                }
+//            }
 
             log.info("userModels={}",userModels);
             user.setUserModels(userModels);