|
|
|
@ -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<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) { |
|
|
|
@ -338,6 +340,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> 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<SysUserDao, SysUserEntity> i |
|
|
|
|
user.setUserOrg(userOrgEntity); |
|
|
|
|
user.setUserBusiness(businessList); |
|
|
|
|
user.setCompanyCodes(companyEntitys); |
|
|
|
|
|
|
|
|
|
user.setEmailCodes(emailCodes); |
|
|
|
|
user.setUserModels(this.getUserCompanyList(userEntity.getCompany())); |
|
|
|
|
// 刷新菜单缓存处理
|
|
|
|
|
this.setMetnuRedis(userEntity.getUserId()); |
|
|
|
|