From e78c77c6dc98ed0f667c77713eb78f253298b06f Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Sat, 7 Oct 2023 11:19:23 +0800
Subject: [PATCH 01/21] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E8=AE=A4=E8=AF=81=E4=BA=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/dxhy/admin/sys/dao/SysUserDao.java   |  9 +++++++++
 .../admin/sys/service/impl/SysUserServiceImpl.java     |  8 +++++++-
 .../src/main/resources/mapper/sys/SysUserDao.xml       | 10 ++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java
index 11d52ee9..f9852f31 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java
@@ -86,6 +86,15 @@ public interface SysUserDao extends BaseMapper<SysUserEntity> {
      */
     List<UserModel> getUserCompanyList(@Param("company") String company);
 
+    /**
+     * 根据公司编码获取税号
+     *
+     * @param id
+     *            公司id
+     * @return 税号
+     */
+    List<UserModel> getUserAuthList(@Param("deptId") String deptId);
+
     /**
      * 根据邮箱获取用户信息
      *
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 c9ae4164..3005b9ae 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
@@ -349,7 +349,8 @@ 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.getUserCompanyList(userEntity.getCompany()));
+            user.setUserModels(this.getUserAuthList(String.valueOf(userEntity.getDeptId())));
             // 刷新菜单缓存处理
             this.setMetnuRedis(userEntity.getUserId());
             user.setEmailCodes(emailCodes);
@@ -365,6 +366,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
         return baseMapper.getUserCompanyList(company);
     }
 
+    private List<UserModel> getUserAuthList(String deptId) {
+        DynamicContextHolder.push(DbConstant.BASICS_READ);
+        return baseMapper.getUserAuthList(deptId);
+    }
+
     private MenuModel setMetnuRedis(long userId) {
         MenuModel menuModel = new MenuModel();
         List<SysMenuEntity> userMenuList = sysMenuService.getUserMenuList(userId);
diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
index 77e94ee5..5bd716f6 100644
--- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
@@ -64,6 +64,16 @@
         WHERE company = #{company}
     </select>
 
+    <select id="getUserAuthList" resultType="com.dxhy.admin.sys.model.UserModel">
+        SELECT
+            u.user_id, u.username, u.loginname
+        FROM
+            sys_user u
+            INNER JOIN sys_dept d ON u.dept_id = d.dept_id
+        WHERE
+            d.dept_id = #{deptId}
+    </select>
+
     <select id="queryUserByEmail" resultType="com.dxhy.admin.sys.entity.SysUserEntity">
         select *
         from sys_user

From 7941a0881f7f64b30531b2083af4f78223bc9876 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Sat, 14 Oct 2023 18:18:26 +0800
Subject: [PATCH 02/21] =?UTF-8?q?ariesy=20=E8=AE=A4=E8=AF=81=E4=BA=BA?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0deptId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/dxhy/admin/sys/model/UserModel.java  | 5 +++++
 .../dxhy/admin/sys/service/impl/SysUserServiceImpl.java    | 4 ++--
 dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml    | 7 +++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java
index 966c5051..7ffebf14 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java
@@ -22,4 +22,9 @@ public class UserModel {
      * 登录名
      */
     private String loginname;
+
+    /**
+     * 登录名
+     */
+    private String deptId;
 }
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 3005b9ae..d7e1c690 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
@@ -349,8 +349,8 @@ 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()));
+//            user.setUserModels(this.getUserAuthList(String.valueOf(userEntity.getDeptId())));
             // 刷新菜单缓存处理
             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 5bd716f6..67859f3a 100644
--- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
@@ -59,8 +59,11 @@
 
 
     <select id="getUserCompanyList" resultType="com.dxhy.admin.sys.model.UserModel">
-        SELECT user_id, username, loginname
-        FROM sys_user
+        SELECT
+            u.user_id, u.username, u.loginname,d.dept_id
+        FROM
+            sys_user u
+            INNER JOIN sys_dept d ON u.dept_id = d.dept_id
         WHERE company = #{company}
     </select>
 

From e26a1ad5895a3747112e516fb0e57aa4d5070eb7 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Sat, 14 Oct 2023 18:36:25 +0800
Subject: [PATCH 03/21] =?UTF-8?q?ariesy=20=E8=AE=A4=E8=AF=81=E4=BA=BA?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0deptId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
index 67859f3a..c2054f63 100644
--- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
@@ -60,11 +60,13 @@
 
     <select id="getUserCompanyList" resultType="com.dxhy.admin.sys.model.UserModel">
         SELECT
-            u.user_id, u.username, u.loginname,d.dept_id
+            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
-        WHERE company = #{company}
+        WHERE u.company = #{company}
     </select>
 
     <select id="getUserAuthList" resultType="com.dxhy.admin.sys.model.UserModel">

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 04/21] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=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">

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 05/21] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=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);

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

---
 .../com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 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 d81dea0c..fa578c37 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,9 +352,9 @@ 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<SysDeptEntity> deptEntities = sysUserOrgService.queryOrgCodes(userId);
             List<UserModel> userModels = new ArrayList<>();
-            for (SysUserOrgEntity entity : orgEntities){
+            for (SysDeptEntity entity : deptEntities){
                 List<UserModel> models = this.getUserAuthList(String.valueOf(entity.getDeptId()));
                 for(UserModel model : models) {
                     userModels.add(model);

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

---
 .../src/main/resources/mapper/sys/SysUserDao.xml  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
index 728f260b..07263dee 100644
--- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
@@ -71,16 +71,15 @@
 
     <select id="getUserAuthList" resultType="com.dxhy.admin.sys.model.UserModel">
         SELECT
-            u.user_id,
-            u.username,
-            u.loginname,
-            u.dept_id
+                u.user_id,
+                u.username,
+                u.loginname,
+                u.dept_id
         FROM
-            sys_user u
-            INNER JOIN sys_user_org d ON u.dept_id = d.dept_id
+                sys_user u
+                INNER JOIN sys_user_org d ON u.user_id = d.userid
         WHERE
-            d.dept_id = #{deptId}
-        group by user_id;
+                d.dept_id = #{deptId}
     </select>
 
     <select id="queryUserByEmail" resultType="com.dxhy.admin.sys.entity.SysUserEntity">

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

---
 .../com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 fa578c37..c8567cf9 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,9 +357,12 @@ 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) {
-                    userModels.add(model);
+                    if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()))) {
+                        userModels.add(model);
+                    }
                 }
             }
+            log.info("userModels={}",userModels);
             user.setUserModels(userModels);
             // 刷新菜单缓存处理
             this.setMetnuRedis(userEntity.getUserId());

From 0bb75b8e4d73af5d70c50667e3c5e417ae62f4a8 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 17 Oct 2023 15:47:24 +0800
Subject: [PATCH 09/21] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=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  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 c8567cf9..fab7c630 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
@@ -362,6 +362,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
                     }
                 }
             }
+
+            //增加当前登录用户选中的数据
+            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);
             // 刷新菜单缓存处理

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 10/21] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=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);

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

---
 .../com/dxhy/admin/sys/model/UserModel.java   |  2 ++
 .../sys/service/impl/SysUserServiceImpl.java  | 21 ++++++++-----------
 .../main/resources/mapper/sys/SysUserDao.xml  |  3 ++-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java
index 7ffebf14..0b5711da 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java
@@ -27,4 +27,6 @@ public class UserModel {
      * 登录名
      */
     private String deptId;
+
+    private String dId;
 }
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 c6f0ed6f..9cb0938b 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
@@ -359,22 +359,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
                 for(UserModel model : models) {
                     if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDeptId()))) {
                         userModels.add(model);
+
+                        if(model.getDeptId().equals(model.getDId())){
+                            UserModel userModel = new UserModel();
+                            userModel.setUserId(model.getUserId());
+                            userModel.setLoginname(model.getLoginname());
+                            userModel.setUsername(model.getUsername());
+                            userModel.setDeptId(model.getDId());
+                            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);
             // 刷新菜单缓存处理
diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
index 07263dee..c9037f46 100644
--- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
@@ -63,7 +63,8 @@
             u.user_id,
             u.username,
             u.loginname,
-            u.dept_id
+            u.dept_id,
+            d.dept_id as dId
         FROM
             sys_user u
         WHERE u.company = #{company}

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

---
 .../com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9cb0938b..bfb9463b 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
@@ -360,7 +360,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
                     if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDeptId()))) {
                         userModels.add(model);
 
-                        if(model.getDeptId().equals(model.getDId())){
+                        if(!model.getDeptId().equals(model.getDId())){
                             UserModel userModel = new UserModel();
                             userModel.setUserId(model.getUserId());
                             userModel.setLoginname(model.getLoginname());

From 0dbec55da0a9e375217c31f28e4407215ab9fa3a Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 17 Oct 2023 18:21:06 +0800
Subject: [PATCH 13/21] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=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/src/main/resources/mapper/sys/SysUserDao.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
index c9037f46..40940bc4 100644
--- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
@@ -64,7 +64,6 @@
             u.username,
             u.loginname,
             u.dept_id,
-            d.dept_id as dId
         FROM
             sys_user u
         WHERE u.company = #{company}
@@ -75,7 +74,8 @@
                 u.user_id,
                 u.username,
                 u.loginname,
-                u.dept_id
+                u.dept_id,
+                d.dept_id as dId
         FROM
                 sys_user u
                 INNER JOIN sys_user_org d ON u.user_id = d.userid

From f0355d04ac3a9f9923d176a45c36f96ce4edfdd1 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Wed, 18 Oct 2023 11:00:06 +0800
Subject: [PATCH 14/21] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0admin?=
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, 8 insertions(+)

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 bfb9463b..b0146aba 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
@@ -368,6 +368,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
                             userModel.setDeptId(model.getDId());
                             userModels.add(userModel);
                         }
+
+                        //每个deptId手动增加一个admin
+                        UserModel userModel = new UserModel();
+                        userModel.setUserId("admin");
+                        userModel.setLoginname("admin");
+                        userModel.setUsername("admin");
+                        userModel.setDeptId(model.getDId());
+                        userModels.add(userModel);
                     }
                 }
             }

From b49b83e72f9f0f456398a4fc9d894ffcc5efb027 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Wed, 18 Oct 2023 15:28:39 +0800
Subject: [PATCH 15/21] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E4=BA=BAadmin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/service/impl/SysUserServiceImpl.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 b0146aba..3c596eb4 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
@@ -368,16 +368,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
                             userModel.setDeptId(model.getDId());
                             userModels.add(userModel);
                         }
-
-                        //每个deptId手动增加一个admin
-                        UserModel userModel = new UserModel();
-                        userModel.setUserId("admin");
-                        userModel.setLoginname("admin");
-                        userModel.setUsername("admin");
-                        userModel.setDeptId(model.getDId());
-                        userModels.add(userModel);
                     }
                 }
+
+                //每个deptId手动增加一个admin
+                UserModel userModel = new UserModel();
+                userModel.setUserId("admin");
+                userModel.setLoginname("admin");
+                userModel.setUsername("admin");
+                userModel.setDeptId(String.valueOf(entity.getDeptId()));
+                userModels.add(userModel);
             }
 
             log.info("userModels={}",userModels);

From 67a7a88f464ae361d0c0f4b589b81de031e455b7 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Wed, 18 Oct 2023 15:59:01 +0800
Subject: [PATCH 16/21] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E4=BA=BAadmin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3c596eb4..119dc70e 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
@@ -373,7 +373,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
 
                 //每个deptId手动增加一个admin
                 UserModel userModel = new UserModel();
-                userModel.setUserId("admin");
+                userModel.setUserId("10086");
                 userModel.setLoginname("admin");
                 userModel.setUsername("admin");
                 userModel.setDeptId(String.valueOf(entity.getDeptId()));

From c32833cf057fc0609e49202e0d9ce74a57b3461d Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 19 Oct 2023 09:20:45 +0800
Subject: [PATCH 17/21] =?UTF-8?q?ariesy=20Redission=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=9B=86=E7=BE=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/service/impl/SysUserServiceImpl.java  | 76 +++++++++++--------
 1 file changed, 46 insertions(+), 30 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 119dc70e..10bb0abd 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
@@ -8,6 +8,7 @@ import javax.annotation.Resource;
 import com.dxhy.common.util.StringHelper;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -351,36 +352,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             user.setUserOrg(userOrgEntity);
             user.setUserBusiness(businessList);
             user.setCompanyCodes(companyEntitys);
-//            user.setUserModels(this.getUserCompanyList(userEntity.getCompany()));
-            List<SysDeptEntity> deptEntities = sysUserOrgService.queryOrgCodes(userId);
-            List<UserModel> userModels = new ArrayList<>();
-            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()) && model.getDeptId().equals(e.getDeptId()))) {
-                        userModels.add(model);
-
-                        if(!model.getDeptId().equals(model.getDId())){
-                            UserModel userModel = new UserModel();
-                            userModel.setUserId(model.getUserId());
-                            userModel.setLoginname(model.getLoginname());
-                            userModel.setUsername(model.getUsername());
-                            userModel.setDeptId(model.getDId());
-                            userModels.add(userModel);
-                        }
-                    }
-                }
-
-                //每个deptId手动增加一个admin
-                UserModel userModel = new UserModel();
-                userModel.setUserId("10086");
-                userModel.setLoginname("admin");
-                userModel.setUsername("admin");
-                userModel.setDeptId(String.valueOf(entity.getDeptId()));
-                userModels.add(userModel);
-            }
-
-            log.info("userModels={}",userModels);
+            List<UserModel> userModels = setUserModels(userEntity, userId);
             user.setUserModels(userModels);
             // 刷新菜单缓存处理
             this.setMetnuRedis(userEntity.getUserId());
@@ -392,6 +364,50 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
         return user;
     }
 
+    @NotNull
+    private List<UserModel> setUserModels(SysUserEntity userEntity, long userId) {
+        //            user.setUserModels(this.getUserCompanyList(userEntity.getCompany()));
+        List<SysDeptEntity> deptEntities = sysUserOrgService.queryOrgCodes(userId);
+        List<UserModel> userModels = new ArrayList<>();
+        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()) && model.getDeptId().equals(e.getDeptId()))) {
+                    userModels.add(model);
+
+                    if(!model.getDeptId().equals(model.getDId())){
+                        UserModel userModel = new UserModel();
+                        userModel.setUserId(model.getUserId());
+                        userModel.setLoginname(model.getLoginname());
+                        userModel.setUsername(model.getUsername());
+                        userModel.setDeptId(model.getDId());
+                        userModels.add(userModel);
+                    }
+                }
+            }
+
+            //每个deptId手动增加一个admin
+            UserModel userModel = new UserModel();
+            userModel.setUserId("10086");
+            userModel.setLoginname("admin");
+            userModel.setUsername("admin");
+            userModel.setDeptId(String.valueOf(entity.getDeptId()));
+            userModels.add(userModel);
+        }
+        if(userModels.stream().noneMatch(e -> userEntity.getUserId().equals(e.getUserId()) && userEntity.getDeptId().equals(e.getDeptId()))) {
+            //当前登录用户手动增加一个admin
+            UserModel userModel = new UserModel();
+            userModel.setUserId("10086");
+            userModel.setLoginname("admin");
+            userModel.setUsername("admin");
+            userModel.setDeptId(String.valueOf(userEntity.getDeptId()));
+            userModels.add(userModel);
+        }
+
+        log.info("userModels={}",userModels);
+        return userModels;
+    }
+
     private List<UserModel> getUserCompanyList(String company) {
         DynamicContextHolder.push(DbConstant.BASICS_READ);
         return baseMapper.getUserCompanyList(company);

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

---
 .../com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 10bb0abd..565cd8bd 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
@@ -397,7 +397,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
         if(userModels.stream().noneMatch(e -> userEntity.getUserId().equals(e.getUserId()) && userEntity.getDeptId().equals(e.getDeptId()))) {
             //当前登录用户手动增加一个admin
             UserModel userModel = new UserModel();
-            userModel.setUserId("10086");
+            userModel.setUserId(String.valueOf(userEntity.getUserId()));
             userModel.setLoginname("admin");
             userModel.setUsername("admin");
             userModel.setDeptId(String.valueOf(userEntity.getDeptId()));

From 08e6cbcce20424b425a34514f851e7a6d53c9b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Wed, 1 Nov 2023 16:57:52 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/service/impl/SysUserServiceImpl.java   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 965262da..bbf331e5 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
@@ -360,17 +360,17 @@ 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()) && model.getDeptId().equals(e.getDeptId()))) {
+                if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDId()))) {
                     userModels.add(model);
 
-                    if(!model.getDeptId().equals(model.getDId())){
-                        UserModel userModel = new UserModel();
-                        userModel.setUserId(model.getUserId());
-                        userModel.setLoginname(model.getLoginname());
-                        userModel.setUsername(model.getUsername());
-                        userModel.setDeptId(model.getDId());
-                        userModels.add(userModel);
-                    }
+//                    if(!model.getDeptId().equals(model.getDId())){
+//                        UserModel userModel = new UserModel();
+//                        userModel.setUserId(model.getUserId());
+//                        userModel.setLoginname(model.getLoginname());
+//                        userModel.setUsername(model.getUsername());
+//                        userModel.setDeptId(model.getDId());
+//                        userModels.add(userModel);
+//                    }
                 }
             }
 

From bed94e9fe8ac9af9a7fb7868c7437c2314551f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Wed, 1 Nov 2023 17:22:49 +0800
Subject: [PATCH 20/21] =?UTF-8?q?deptId=E5=92=8Cdid=E4=BA=92=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java   | 2 +-
 dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml       | 4 ++--
 2 files changed, 3 insertions(+), 3 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 bbf331e5..e10fb10d 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
@@ -360,7 +360,7 @@ 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()) && model.getDeptId().equals(e.getDId()))) {
+                if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDeptId()))) {
                     userModels.add(model);
 
 //                    if(!model.getDeptId().equals(model.getDId())){
diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
index 40940bc4..81be0ce3 100644
--- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
@@ -74,8 +74,8 @@
                 u.user_id,
                 u.username,
                 u.loginname,
-                u.dept_id,
-                d.dept_id as dId
+                u.dept_id as dId,
+                d.dept_id
         FROM
                 sys_user u
                 INNER JOIN sys_user_org d ON u.user_id = d.userid

From 9566e2c4fd3c291622067f4a48270227d7b2416b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Mon, 6 Nov 2023 15:48:15 +0800
Subject: [PATCH 21/21] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=8E=B7=E5=8F=96=E8=AE=A4=E8=AF=81=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/admin/sys/dao/SysUserDao.java    |  6 +-
 .../com/dxhy/admin/sys/model/UserModel.java   |  4 ++
 .../sys/service/impl/SysUserServiceImpl.java  | 60 +++++++------------
 .../main/resources/mapper/sys/SysUserDao.xml  | 23 +++----
 4 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java
index f9852f31..d504a78c 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserDao.java
@@ -89,11 +89,11 @@ public interface SysUserDao extends BaseMapper<SysUserEntity> {
     /**
      * 根据公司编码获取税号
      *
-     * @param id
-     *            公司id
+     * @param
+     *
      * @return 税号
      */
-    List<UserModel> getUserAuthList(@Param("deptId") String deptId);
+    List<UserModel> getUserAuthList(@Param("deptId") String deptId,@Param("deptIdList")List<Long> deptIdList);
 
     /**
      * 根据邮箱获取用户信息
diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java
index 0b5711da..929da353 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/UserModel.java
@@ -2,6 +2,8 @@ package com.dxhy.admin.sys.model;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author jiaohongyang（焦红阳）
  * @date 2020-11-11
@@ -29,4 +31,6 @@ public class UserModel {
     private String deptId;
 
     private String dId;
+
+    private List<String> deptIdList;
 }
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 e10fb10d..2d94d7c2 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
@@ -354,55 +354,41 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
 
     @NotNull
     private List<UserModel> setUserModels(SysUserEntity userEntity, long userId) {
-        //            user.setUserModels(this.getUserCompanyList(userEntity.getCompany()));
+
         List<SysDeptEntity> deptEntities = sysUserOrgService.queryOrgCodes(userId);
-        List<UserModel> userModels = new ArrayList<>();
-        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()) && model.getDeptId().equals(e.getDeptId()))) {
-                    userModels.add(model);
-
-//                    if(!model.getDeptId().equals(model.getDId())){
-//                        UserModel userModel = new UserModel();
-//                        userModel.setUserId(model.getUserId());
-//                        userModel.setLoginname(model.getLoginname());
-//                        userModel.setUsername(model.getUsername());
-//                        userModel.setDeptId(model.getDId());
-//                        userModels.add(userModel);
-//                    }
-                }
-            }
 
-            //每个deptId手动增加一个admin
-            UserModel userModel = new UserModel();
-            userModel.setUserId("10086");
-            userModel.setLoginname("admin");
-            userModel.setUsername("admin");
-            userModel.setDeptId(String.valueOf(entity.getDeptId()));
-            userModels.add(userModel);
-        }
-        if(userModels.stream().noneMatch(e -> userEntity.getUserId().equals(e.getUserId()) && userEntity.getDeptId().equals(e.getDeptId()))) {
-            //当前登录用户手动增加一个admin
+        List<Long> deptIds = deptEntities.stream().map(SysDeptEntity::getDeptId).collect(Collectors.toList());
+
+        List<UserModel> models = this.getUserAuthList(String.valueOf(userId),deptIds);
+
+        models.forEach(e->e.setDeptIdList(Arrays.asList(e.getDId().split(","))));
+
+        //手动添加Admin
+        List<String> depts = new ArrayList<>();
+        deptIds.forEach(e->depts.add(String.valueOf(e)));
+        if (models.stream().noneMatch(e -> "admin".equals(e.getUsername()))) {
             UserModel userModel = new UserModel();
-            userModel.setUserId(String.valueOf(userEntity.getUserId()));
-            userModel.setLoginname("admin");
             userModel.setUsername("admin");
-            userModel.setDeptId(String.valueOf(userEntity.getDeptId()));
-            userModels.add(userModel);
+            userModel.setDeptIdList(depts);
+            models.add(userModel);
+        }else {
+            for (UserModel model : models) {
+                if ("admin".equals(model.getUsername())){
+                    model.setDeptIdList(depts);
+                }
+            }
         }
 
-        log.info("userModels={}",userModels);
-        return userModels;
+        log.info("models={}",models);
+        return models;
     }
 
     private List<UserModel> getUserCompanyList(String company) {
         return baseMapper.getUserCompanyList(company);
     }
 
-    private List<UserModel> getUserAuthList(String deptId) {
-        DynamicContextHolder.push(DbConstant.BASICS_READ);
-        return baseMapper.getUserAuthList(deptId);
+    private List<UserModel> getUserAuthList(String deptId,List<Long> deptIds) {
+        return baseMapper.getUserAuthList(deptId,deptIds);
     }
 
     private MenuModel setMetnuRedis(long userId) {
diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
index 81be0ce3..61e72e01 100644
--- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml
@@ -70,17 +70,18 @@
     </select>
 
     <select id="getUserAuthList" resultType="com.dxhy.admin.sys.model.UserModel">
-        SELECT
-                u.user_id,
-                u.username,
-                u.loginname,
-                u.dept_id as dId,
-                d.dept_id
-        FROM
-                sys_user u
-                INNER JOIN sys_user_org d ON u.user_id = d.userid
-        WHERE
-                d.dept_id = #{deptId}
+        select u.user_id,
+               u.username,
+               u.loginname,
+               GROUP_CONCAT(d.dept_id) as dId,
+               d.dept_id
+        from sys_user u inner join sys_user_org uo on u.user_id = uo.userid
+                        inner join sys_dept d on d.dept_id = uo.dept_id
+            where d.dept_id in
+            <foreach collection="deptIdList" item="deptId" open="(" close=")" separator=",">
+                #{deptId}
+            </foreach>
+        group by u.user_id
     </select>
 
     <select id="queryUserByEmail" resultType="com.dxhy.admin.sys.entity.SysUserEntity">