Commit 46010f054c3ac1f0c227c829bc7791c5feeb26da
1 parent
9e64ca2d46
Exists in
master
and in
1 other branch
permission2
Showing 1 changed file with 4 additions and 4 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
View file @
46010f0
| ... | ... | @@ -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(); |