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