From c1002ac3a31576be96378e35c9599832d70be8e5 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Tue, 10 May 2016 18:15:47 +0800 Subject: [PATCH] bug fix --- .../com/lyms/platform/operate/web/controller/UsersController.java | 6 +++--- .../java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java | 2 +- 2 files changed, 4 insertions(+), 4 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 5ed2902..37caa96 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 @@ -379,16 +379,16 @@ public class UsersController extends BaseController { List organizations = new ArrayList<>(); - if(null != users.getOrgId() && UserTypeEnum.NORMAL_USER.equals(users.getType())) { //普通用户 + if(null != users.getOrgId() && UserTypeEnum.NORMAL_USER.getId().equals(users.getType())) { //普通用户 organizations.add(organizationService.getOrganization(users.getOrgId())); - } else if(UserTypeEnum.PLATFORM_ADMIN.equals(users.getType())) { //管理员 + } 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.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); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java index a65a0a2..e789ee3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java @@ -45,7 +45,7 @@ public class AutoMatchFacade { List list = usersService.queryUsers(usersQuery); if (CollectionUtils.isNotEmpty(list)) { //用户角色 - if (UserTypeEnum.NORMAL_USER.equals(list.get(0).getType()) ) { + if (UserTypeEnum.NORMAL_USER.getId().equals(list.get(0).getType()) ) { Organization organization = organizationService.getOrganization(list.get(0).getOrgId()); return organization.getAreaId(); }else { -- 1.8.3.1