|
|
|
@ -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(); |
|
|
|
|
} |
|
|
|
|