Commit 1ae162ebf79ffaab79ae2004e5bd5d52382c2ba9
1 parent
0b75bcaab3
Exists in
master
and in
7 other branches
分娩作废产检劵
Showing 1 changed file with 27 additions and 14 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
View file @
1ae162e
| ... | ... | @@ -6,6 +6,7 @@ |
| 6 | 6 | import com.lyms.platform.common.base.ContextHolder; |
| 7 | 7 | import com.lyms.platform.common.base.LoginContext; |
| 8 | 8 | import com.lyms.platform.common.enums.PermissionTypeEnums; |
| 9 | +import com.lyms.platform.common.enums.UserTypeEnum; | |
| 9 | 10 | import com.lyms.platform.common.enums.YnEnums; |
| 10 | 11 | import com.lyms.platform.common.exception.BusinessException; |
| 11 | 12 | import com.lyms.platform.common.result.BaseResponse; |
| ... | ... | @@ -44,6 +45,8 @@ |
| 44 | 45 | private UserRoleMapsService userRoleMapsService; |
| 45 | 46 | @Autowired |
| 46 | 47 | private AccessPermissionFacade accessPermissionFacade; |
| 48 | + @Autowired | |
| 49 | + private RolesService rolesService; | |
| 47 | 50 | |
| 48 | 51 | |
| 49 | 52 | /** |
| 50 | 53 | |
| 51 | 54 | |
| 52 | 55 | |
| ... | ... | @@ -90,24 +93,34 @@ |
| 90 | 93 | if (null != loginContext) { |
| 91 | 94 | users = usersService.getUsers(loginContext.getId()); |
| 92 | 95 | } |
| 93 | - | |
| 94 | - //获取用户角色信息 | |
| 95 | - UserRoleMapsQuery query = new UserRoleMapsQuery(); | |
| 96 | - query.setUserId(users.getId()); | |
| 97 | - query.setYn(YnEnums.YES.getId()); | |
| 98 | - List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query); | |
| 99 | - List<Integer> permissionIds = new ArrayList<>(); | |
| 100 | 96 | List permissions = new ArrayList<>(); |
| 97 | + //超级管理员拥有所有角色和权限 | |
| 98 | + if (users.getType().equals(UserTypeEnum.SUPPER_ADMIN.getId())) { | |
| 99 | + Permissions2Query permissionsQuery = new Permissions2Query(); | |
| 100 | + permissionsQuery.setYn(YnEnums.YES.getId()); | |
| 101 | + permissions = permissions2Service.queryPermissions2(permissionsQuery); | |
| 102 | + } | |
| 103 | + //其他用户 | |
| 104 | + else if (users.getType().equals(UserTypeEnum.PLATFORM_ADMIN.getId()) || users.getType().equals(UserTypeEnum.NORMAL_USER.getId())) { | |
| 105 | + //获取用户角色信息 | |
| 106 | + UserRoleMapsQuery query = new UserRoleMapsQuery(); | |
| 107 | + query.setUserId(users.getId()); | |
| 108 | + query.setYn(YnEnums.YES.getId()); | |
| 109 | + List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query); | |
| 110 | + List<Integer> permissionIds = new ArrayList<>(); | |
| 101 | 111 | |
| 102 | - List<Permissions2> local = permissions2Service.queryPermissionByRoleIds(userRoleMapses); | |
| 103 | - if (CollectionUtils.isNotEmpty(local)) { | |
| 104 | - for (Permissions2 permissions1 : local) { | |
| 105 | - if (!permissionIds.contains(permissions1.getId())) { | |
| 106 | - permissionIds.add(permissions1.getId()); | |
| 107 | - permissions.add(permissions1); | |
| 112 | + | |
| 113 | + List<Permissions2> local = permissions2Service.queryPermissionByRoleIds(userRoleMapses); | |
| 114 | + if (CollectionUtils.isNotEmpty(local)) { | |
| 115 | + for (Permissions2 permissions1 : local) { | |
| 116 | + if (!permissionIds.contains(permissions1.getId())) { | |
| 117 | + permissionIds.add(permissions1.getId()); | |
| 118 | + permissions.add(permissions1); | |
| 119 | + } | |
| 108 | 120 | } |
| 109 | 121 | } |
| 110 | 122 | } |
| 123 | + | |
| 111 | 124 | ResultUtils.buildSuccessResultAndWrite(response, permissions); |
| 112 | 125 | } |
| 113 | 126 |