liquanyu / regional-platform

Download as
Browse Code »

Commit 10a59e70c298f10f1ab091c5395c22c2473bb308

Authored by liquanyu
1 parent 68e4ffdad1
Exists in master and in 1 other branch dev

儿童区域权限修改

Showing 1 changed file with 19 additions and 20 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 10a59e7
... ... @@ -1945,29 +1945,28 @@
1945 1945 for (Organization organization : organizationList) {
1946 1946 hospitalIdList.add(String.valueOf(organization.getId()));
1947 1947 }
1948   - }else{
1949   - // List<Organization> organizationList = organizationService.queryOrganization(organizationQuery);
1950   - // for (Organization organization : organizationList) {
1951   - // hospitalIdList.add(String.valueOf(organization.getId()));
1952   - // }
1953   - String hospital = autoMatchFacade.getHospitalId(userId);
1954   - if(null!=hospital){
1955   - hospitalIdList.add(hospital);
1956   - }
1957   - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
1958   - dataPermissionsModelQuery.setUserId(userId);
1959   - List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery);
1960   - if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) {
1961   - Set<String> set = dataPermissionsModelList.get(0).getData().keySet();
1962   - Iterator<String> it = set.iterator();
1963   - while (it.hasNext()) {
1964   - String id = it.next();
1965   - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalIdList.contains(id)) {
1966   - hospitalIdList.add(id);
1967   - }
  1948 + }
  1949 +
  1950 + String hospital = autoMatchFacade.getHospitalId(userId);
  1951 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hospital) && !hospitalIdList.contains(hospital)) {
  1952 + hospitalIdList.add(hospital);
  1953 +
  1954 + }
  1955 +
  1956 + DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
  1957 + dataPermissionsModelQuery.setUserId(userId);
  1958 + List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery);
  1959 + if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) {
  1960 + Set<String> set = dataPermissionsModelList.get(0).getData().keySet();
  1961 + Iterator<String> it = set.iterator();
  1962 + while (it.hasNext()) {
  1963 + String id = it.next();
  1964 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalIdList.contains(id)) {
  1965 + hospitalIdList.add(id);
1968 1966 }
1969 1967 }
1970 1968 }
  1969 +
1971 1970  
1972 1971 }else{
1973 1972 String hospitalId = "";