Commit 224a1e86ed16ed5d287c346616f5ba3feb4c0c63
1 parent
10a59e70c2
Exists in
master
and in
6 other branches
儿童区域权限修改
Showing 1 changed file with 4 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
224a1e8
| ... | ... | @@ -1950,9 +1950,9 @@ |
| 1950 | 1950 | String hospital = autoMatchFacade.getHospitalId(userId); |
| 1951 | 1951 | if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hospital) && !hospitalIdList.contains(hospital)) { |
| 1952 | 1952 | hospitalIdList.add(hospital); |
| 1953 | - | |
| 1954 | 1953 | } |
| 1955 | 1954 | |
| 1955 | + List<String> permissions = new ArrayList<>(); | |
| 1956 | 1956 | DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); |
| 1957 | 1957 | dataPermissionsModelQuery.setUserId(userId); |
| 1958 | 1958 | List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); |
| 1959 | 1959 | |
| ... | ... | @@ -1961,11 +1961,11 @@ |
| 1961 | 1961 | Iterator<String> it = set.iterator(); |
| 1962 | 1962 | while (it.hasNext()) { |
| 1963 | 1963 | String id = it.next(); |
| 1964 | - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalIdList.contains(id)) { | |
| 1965 | - hospitalIdList.add(id); | |
| 1966 | - } | |
| 1964 | + permissions.add(id); | |
| 1967 | 1965 | } |
| 1968 | 1966 | } |
| 1967 | + | |
| 1968 | + hospitalIdList.retainAll(permissions); | |
| 1969 | 1969 | |
| 1970 | 1970 | |
| 1971 | 1971 | }else{ |