Commit 7fce7d5af8e42a6c1f5d63b0017db110471a0413
1 parent
e858ae99cb
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 15 additions and 0 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
View file @
7fce7d5
| ... | ... | @@ -236,9 +236,18 @@ |
| 236 | 236 | DataPermissionsModelQuery visitQuery = new DataPermissionsModelQuery(); |
| 237 | 237 | visitQuery.setUserId(userId); |
| 238 | 238 | List<DataPermissionsModel> list = dataPermissionService.queryPermission(visitQuery); |
| 239 | + if (CollectionUtils.isEmpty(list)) | |
| 240 | + { | |
| 241 | + return; | |
| 242 | + } | |
| 239 | 243 | for (DataPermissionsModel model : list) { |
| 240 | 244 | if (StringUtils.isNotBlank(model.getAreaPermission())) { |
| 241 | 245 | List<AddressBean> addressBeanList = JsonUtil.toList(model.getAreaPermission(), AddressBean.class); |
| 246 | + if (CollectionUtils.isEmpty(addressBeanList)) | |
| 247 | + { | |
| 248 | + continue; | |
| 249 | + } | |
| 250 | + | |
| 242 | 251 | Set<String> organizationIds = new HashSet<>(); |
| 243 | 252 | if (model.getData() != null) { |
| 244 | 253 | for (Object s:model.getData().keySet()) { |
| ... | ... | @@ -246,6 +255,12 @@ |
| 246 | 255 | } |
| 247 | 256 | } |
| 248 | 257 | for (AddressBean addressBean:addressBeanList) { |
| 258 | + | |
| 259 | + if (addressBean == null) | |
| 260 | + { | |
| 261 | + continue; | |
| 262 | + } | |
| 263 | + | |
| 249 | 264 | OrganizationQuery query = new OrganizationQuery(); |
| 250 | 265 | query.setProvinceId(addressBean.getP()); |
| 251 | 266 | query.setCityId(addressBean.getC()); |