From f0640d27434d1d76b7e4fc5f55bf9f270ad72d95 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Tue, 10 May 2016 18:26:20 +0800 Subject: [PATCH] bug fix --- .../com/lyms/platform/operate/web/controller/UsersController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 37caa96..d8a0f02 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 @@ -380,15 +380,17 @@ public class UsersController extends BaseController { List organizations = new ArrayList<>(); if(null != users.getOrgId() && UserTypeEnum.NORMAL_USER.getId().equals(users.getType())) { //普通用户 - organizations.add(organizationService.getOrganization(users.getOrgId())); - } else if(UserTypeEnum.PLATFORM_ADMIN.getId().equals(users.getType())) { //管理员 + Organization organization = organizationService.getOrganization(users.getOrgId()); + organizations.add(organization); + users.setOrganization(organization); + } else if (UserTypeEnum.PLATFORM_ADMIN.getId().equals(users.getType())) { //管理员 List list2 =accessPermissionFacade.findAccessPerminssionByUserId(users.getId()); if(CollectionUtils.isNotEmpty(list2)){ for(Organization organization:list2){ organizations.add(organization); } } - } else if(UserTypeEnum.SUPPER_ADMIN.getId().equals(users.getType())) {//超级管理员 + } else if (UserTypeEnum.SUPPER_ADMIN.getId().equals(users.getType())) {//超级管理员 OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setYn(YnEnums.YES.getId()); organizations = organizationService.queryOrganization(organizationQuery); -- 1.8.3.1