Commit c1002ac3a31576be96378e35c9599832d70be8e5
1 parent
145f00fd9f
Exists in
master
and in
1 other branch
bug fix
Showing 2 changed files with 4 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
c1002ac
| ... | ... | @@ -379,16 +379,16 @@ |
| 379 | 379 | |
| 380 | 380 | |
| 381 | 381 | List<Organization> organizations = new ArrayList<>(); |
| 382 | - if(null != users.getOrgId() && UserTypeEnum.NORMAL_USER.equals(users.getType())) { //普通用户 | |
| 382 | + if(null != users.getOrgId() && UserTypeEnum.NORMAL_USER.getId().equals(users.getType())) { //普通用户 | |
| 383 | 383 | organizations.add(organizationService.getOrganization(users.getOrgId())); |
| 384 | - } else if(UserTypeEnum.PLATFORM_ADMIN.equals(users.getType())) { //管理员 | |
| 384 | + } else if(UserTypeEnum.PLATFORM_ADMIN.getId().equals(users.getType())) { //管理员 | |
| 385 | 385 | List<Organization> list2 =accessPermissionFacade.findAccessPerminssionByUserId(users.getId()); |
| 386 | 386 | if(CollectionUtils.isNotEmpty(list2)){ |
| 387 | 387 | for(Organization organization:list2){ |
| 388 | 388 | organizations.add(organization); |
| 389 | 389 | } |
| 390 | 390 | } |
| 391 | - } else if(UserTypeEnum.SUPPER_ADMIN.equals(users.getType())) {//超级管理员 | |
| 391 | + } else if(UserTypeEnum.SUPPER_ADMIN.getId().equals(users.getType())) {//超级管理员 | |
| 392 | 392 | OrganizationQuery organizationQuery = new OrganizationQuery(); |
| 393 | 393 | organizationQuery.setYn(YnEnums.YES.getId()); |
| 394 | 394 | organizations = organizationService.queryOrganization(organizationQuery); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
View file @
c1002ac
| ... | ... | @@ -45,7 +45,7 @@ |
| 45 | 45 | List<Users> list = usersService.queryUsers(usersQuery); |
| 46 | 46 | if (CollectionUtils.isNotEmpty(list)) { |
| 47 | 47 | //用户角色 |
| 48 | - if (UserTypeEnum.NORMAL_USER.equals(list.get(0).getType()) ) { | |
| 48 | + if (UserTypeEnum.NORMAL_USER.getId().equals(list.get(0).getType()) ) { | |
| 49 | 49 | Organization organization = organizationService.getOrganization(list.get(0).getOrgId()); |
| 50 | 50 | return organization.getAreaId(); |
| 51 | 51 | }else { |