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 948ee077..d81dea0c 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 @@ -352,14 +352,12 @@ public class SysUserServiceImpl extends ServiceImpl i user.setUserBusiness(businessList); user.setCompanyCodes(companyEntitys); // user.setUserModels(this.getUserCompanyList(userEntity.getCompany())); + List orgEntities = sysUserOrgService.queryOrgIdList(userId); List userModels = new ArrayList<>(); - List userOrgEntities = userEntity.getUserOrgEntities(); - for (SysUserOrgEntity entity : userOrgEntities){ + for (SysUserOrgEntity entity : orgEntities){ List 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);