diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java index f0c874e..9f7e05d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java @@ -27,6 +27,7 @@ public class Users { private List roles; private Departments departmentses; private Organization organization; + private List organizations; private String foreignId; private String roleStr; @@ -72,6 +73,14 @@ public class Users { this.organization = organization; } + public List getOrganizations() { + return organizations; + } + + public void setOrganizations(List organizations) { + this.organizations = organizations; + } + public List getRoles() { return roles; } 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 06d423d..a3d389c 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 @@ -85,8 +85,20 @@ public class UsersController extends BaseController { //设置用户角色信息 for(Users user : users) { user.setRoles(this.getUserRoles(user.getId())); - user.setOrganization(organizationService.getOrganization(user.getOrgId())); + user.setDepartmentses(departmentsService.getDepartments(user.getDeptId())); + + UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery(); + userOrganizationMapsQuery.setUserId(user.getId()); + userOrganizationMapsQuery.setYn(YnEnums.YES.getId()); + List userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery); + List organizations = null; + for(UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) { + organizations = new ArrayList<>(); + organizations.add(organizationService.getOrganization(userOrganizationMaps.getOrgId())); + } + + user.setOrganizations(organizations); } FrontEndResult frontEndResult = new FrontEndResult();