Commit 675b63ba07c56bd0f1334efc6987cbfdcbbc694f
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
View file @
675b63b
| ... | ... | @@ -228,11 +228,11 @@ |
| 228 | 228 | for (DataPermissionsModel model : list) { |
| 229 | 229 | if (StringUtils.isNotBlank(model.getAreaPermission())) { |
| 230 | 230 | List<AddressBean> addressBeanList = JsonUtil.toList(model.getAreaPermission(), AddressBean.class); |
| 231 | - Set<String> organizationIds = null; | |
| 231 | + Set<String> organizationIds = new HashSet<>(); | |
| 232 | 232 | if (model.getData() != null) { |
| 233 | - organizationIds = model.getData().keySet(); | |
| 234 | - } else { | |
| 235 | - organizationIds = new HashSet<>(); | |
| 233 | + for (Object s:model.getData().keySet()) { | |
| 234 | + organizationIds.add(s.toString()); | |
| 235 | + } | |
| 236 | 236 | } |
| 237 | 237 | for (AddressBean addressBean:addressBeanList) { |
| 238 | 238 | OrganizationQuery query = new OrganizationQuery(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
675b63b
| ... | ... | @@ -75,7 +75,8 @@ |
| 75 | 75 | private static final String ADMIN="管理员"; |
| 76 | 76 | private static final String replacePwd = "[$#&/]-+"; |
| 77 | 77 | |
| 78 | - | |
| 78 | + @RequestMapping(value = "/rebuildUserRoles", method = RequestMethod.GET) | |
| 79 | + @ResponseBody | |
| 79 | 80 | public String rebuildUserRoles(@RequestParam(value = "hospitalId")Integer hospitalId) { |
| 80 | 81 | StringBuffer sb = new StringBuffer(); |
| 81 | 82 | Organization organization = organizationService.getOrganization(hospitalId); |
| ... | ... | @@ -117,9 +118,6 @@ |
| 117 | 118 | } |
| 118 | 119 | } |
| 119 | 120 | } |
| 120 | - | |
| 121 | - | |
| 122 | - | |
| 123 | 121 | } else { |
| 124 | 122 | sb.append("机构不存在："+hospitalId); |
| 125 | 123 | } |