Commit 730896ecf9ec85ff1b904813c5d9cf3859a88cf6
1 parent
68d38516c5
Exists in
master
and in
8 other branches
add extends BaseModel
Showing 1 changed file with 12 additions and 16 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
730896e
| ... | ... | @@ -474,31 +474,27 @@ |
| 474 | 474 | } |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - | |
| 477 | + List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(users.getId()); | |
| 478 | + if (permissionsModelList != null && permissionsModelList.size() > 0) { | |
| 479 | + users.setAreaPermission(permissionsModelList.get(0).getAreaPermission()); | |
| 480 | + } | |
| 478 | 481 | List<Organization> organizations = new ArrayList<>(); |
| 479 | - if(null != users.getOrgId() && UserTypeEnum.NORMAL_USER.getId().equals(users.getType())) { //普通用户 | |
| 482 | + if (UserTypeEnum.SUPPER_ADMIN.getId().equals(users.getType())) {//超级管理员 | |
| 483 | + OrganizationQuery organizationQuery = new OrganizationQuery(); | |
| 484 | + organizationQuery.setYn(YnEnums.YES.getId()); | |
| 485 | + organizations = organizationService.queryOrganization(organizationQuery); | |
| 486 | + } else { | |
| 480 | 487 | Organization organization = organizationService.getOrganization(users.getOrgId()); |
| 481 | 488 | organizations.add(organization); |
| 482 | 489 | users.setOrganization(organization); |
| 483 | - } else if (UserTypeEnum.PLATFORM_ADMIN.getId().equals(users.getType())) { //管理员 | |
| 484 | - List<Organization> list2 = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(users.getId())); | |
| 490 | + List<Organization> list2 = accessPermissionFacade.getOrganization(permissionsModelList); | |
| 485 | 491 | if(CollectionUtils.isNotEmpty(list2)){ |
| 486 | - for(Organization organization:list2){ | |
| 487 | - organizations.add(organization); | |
| 492 | + for(Organization o:list2){ | |
| 493 | + organizations.add(o); | |
| 488 | 494 | } |
| 489 | 495 | } |
| 490 | - } else if (UserTypeEnum.SUPPER_ADMIN.getId().equals(users.getType())) {//超级管理员 | |
| 491 | - OrganizationQuery organizationQuery = new OrganizationQuery(); | |
| 492 | - organizationQuery.setYn(YnEnums.YES.getId()); | |
| 493 | - organizations = organizationService.queryOrganization(organizationQuery); | |
| 494 | 496 | } |
| 495 | - | |
| 496 | 497 | users.setOrganizations(organizations); |
| 497 | - | |
| 498 | - List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(users.getId()); | |
| 499 | - if (permissionsModelList != null && permissionsModelList.size() > 0) { | |
| 500 | - users.setAreaPermission(permissionsModelList.get(0).getAreaPermission()); | |
| 501 | - } | |
| 502 | 498 | |
| 503 | 499 | Map<String, Object> map = new HashMap<>(); |
| 504 | 500 | map.put("user", users); |