diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/User.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/User.java index c0c8ca7a..e902fd38 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/User.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/User.java @@ -51,6 +51,8 @@ public class User implements Serializable { private List companyCodes; + private List emailCodes; + private String qsStatus; private String webscoketUrl; 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 fd22b3a2..6c733f9f 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 @@ -1,6 +1,7 @@ package com.dxhy.admin.sys.service.impl; import java.util.*; +import java.util.stream.Collectors; import javax.annotation.Resource; @@ -325,6 +326,7 @@ public class SysUserServiceImpl extends ServiceImpl i } //获取组织编码 List companyEntitys = sysUserOrgService.getOrgsByUserId(userEntity.getUserId()); + List emailCodes = new ArrayList<>(); if (companyEntitys != null && companyEntitys.size() > 0) { for (SysCompanyEntity companyEntity : companyEntitys) { if (companyEntity != null) { @@ -338,6 +340,7 @@ public class SysUserServiceImpl extends ServiceImpl i // company.setCompanyName("()暂无组织编码发票"); // company.setCompanyCode("88"); // companyEntitys.add(company); + emailCodes = companyEntitys.stream().filter(e -> StringUtils.isNotBlank(e.getGfsh())).collect(Collectors.toList()); } user = this.toUser(user, userEntity); @@ -345,7 +348,7 @@ public class SysUserServiceImpl extends ServiceImpl i user.setUserOrg(userOrgEntity); user.setUserBusiness(businessList); user.setCompanyCodes(companyEntitys); - + user.setEmailCodes(emailCodes); user.setUserModels(this.getUserCompanyList(userEntity.getCompany())); // 刷新菜单缓存处理 this.setMetnuRedis(userEntity.getUserId());