From bef3462aeb922bf4c8794354822feab1c50eae6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Thu, 14 Sep 2023 14:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81?=
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 f678621b..c9ae4164 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
@@ -326,6 +326,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             }
             //获取组织编码
             List<SysCompanyEntity> companyEntitys = sysUserOrgService.getOrgsByUserId(userEntity.getUserId());
+            List<SysCompanyEntity> emailCodes = new ArrayList<>();
             if (companyEntitys != null && companyEntitys.size() > 0) {
                 for (SysCompanyEntity companyEntity : companyEntitys) {
                     if (companyEntity != null) {
@@ -339,6 +340,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
 //                company.setCompanyName("()暂无组织编码发票");
 //                company.setCompanyCode("88");
 //                companyEntitys.add(company);
+                List<SysCompanyEntity> collect = companyEntitys.stream().filter(e -> StringUtils.isNotBlank(e.getGfsh())).collect(Collectors.toList());
+                emailCodes = JSON.parseArray(JSON.toJSONString(collect), SysCompanyEntity.class);
             }
 
             user = this.toUser(user, userEntity);
@@ -349,7 +352,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             user.setUserModels(this.getUserCompanyList(userEntity.getCompany()));
             // 刷新菜单缓存处理
             this.setMetnuRedis(userEntity.getUserId());
-            user.setEmailCodes(sysUserOrgService.getEmailOrgsByUserId(userEntity.getUserId()));
+            user.setEmailCodes(emailCodes);
         } catch (Exception e) {
             e.printStackTrace();
         }