diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index fc4ed37..b7d2dbe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -171,11 +171,16 @@ public class UsersController extends BaseController { List users = usersService.queryUsers2(usersQuery); - + List organizations = null; //设置用户角色信息 for(Users user : users) { + organizations = new ArrayList<>(); + Organization organization = organizationService.getOrganization(user.getOrgId()); + user.setOrganization(organization); + organizations.add(organization); + user.setOrganizations(organizations); + user.setRoles(this.getUserRoles(user.getId())); - user.setOrganization(organizationService.getOrganization(user.getOrgId())); user.setDepartmentses(departmentsService.getDepartments(user.getDeptId())); } @@ -369,6 +374,24 @@ public class UsersController extends BaseController { } } + + List organizations = new ArrayList<>(); + if(null != users.getOrgId() && new Integer(1).equals(users.getType())) { //普通用户 + organizations.add(organizationService.getOrganization(users.getOrgId())); + } else if(new Integer(0).equals(users.getType())) { //管理员 + List list2 =accessPermissionFacade.findAccessPerminssionByUserId(users.getId()); + if(CollectionUtils.isNotEmpty(list2)){ + for(Organization organization:list2){ + organizations.add(organization); + } + } + } else if(new Integer(2).equals(users.getType())) {//超级管理员 + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setYn(YnEnums.YES.getId()); + organizations = organizationService.queryOrganization(organizationQuery); + } + + users.setOrganizations(organizations); Map map = new HashMap<>(); map.put("user", users); map.put("roles", roles); @@ -377,7 +400,6 @@ public class UsersController extends BaseController { ResultUtils.buildSuccessResultAndWrite(response, map); } - /** * 获取 用户角色信息 */