Commit b9ec34e74b10061a2d8fae4839504c7cc7ab47de
1 parent
70906c72d3
Exists in
master
and in
6 other branches
服务同步
Showing 2 changed files with 43 additions and 29 deletions
platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
View file @
b9ec34e
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
View file @
b9ec34e
| ... | ... | @@ -277,11 +277,7 @@ |
| 277 | 277 | basicQuery.setYn(YnEnums.YES.getId()); |
| 278 | 278 | basicQuery.setTypeId("b7ea005c-dfac-4c2a-bdae-25239b3f44fd"); |
| 279 | 279 | |
| 280 | - List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(userId); | |
| 281 | 280 | |
| 282 | - String permission = permissionsModelList.get(0).getAreaPermission(); | |
| 283 | - System.out.println("permission======" + permission); | |
| 284 | - | |
| 285 | 281 | if (StringUtils.isNotEmpty(countRequest.getProvinceId())) |
| 286 | 282 | { |
| 287 | 283 | basicQuery.setParentId(countRequest.getProvinceId()); |
| ... | ... | @@ -309,30 +305,8 @@ |
| 309 | 305 | //用于存在没有机构的区域Id |
| 310 | 306 | List<String> addrId = new ArrayList<>(); |
| 311 | 307 | |
| 312 | - | |
| 313 | - //权限的id | |
| 314 | - List<String> childsId = new ArrayList<>(); | |
| 315 | - | |
| 316 | - if (StringUtils.isNotEmpty(permission)) { | |
| 317 | - List<Map> permissions = JsonUtil.toList(permission, Map.class); | |
| 318 | - if (CollectionUtils.isNotEmpty(permissions)) | |
| 319 | - { | |
| 320 | - for (Map map : permissions) | |
| 321 | - { | |
| 322 | - if (addrType == 1) | |
| 323 | - { | |
| 324 | - String c = String.valueOf(map.get("c")); | |
| 325 | - childsId.add(c); | |
| 326 | - } | |
| 327 | - else if (addrType == 2) | |
| 328 | - { | |
| 329 | - String a = String.valueOf(map.get("a")); | |
| 330 | - childsId.add(a); | |
| 331 | - } | |
| 332 | - | |
| 333 | - } | |
| 334 | - } | |
| 335 | - } | |
| 308 | + //区域权限id | |
| 309 | + List<String> childsId = getAreaPermission(userId, addrType); | |
| 336 | 310 | basicQuery.setIds(childsId); |
| 337 | 311 | |
| 338 | 312 | //获取地址列表 |
| ... | ... | @@ -677,6 +651,43 @@ |
| 677 | 651 | } |
| 678 | 652 | |
| 679 | 653 | /** |
| 654 | + * 获取用户下面的区域权限 | |
| 655 | + * @param userId | |
| 656 | + * @param addrType | |
| 657 | + * @return | |
| 658 | + */ | |
| 659 | + private List<String> getAreaPermission(Integer userId,int addrType) { | |
| 660 | + //权限的id | |
| 661 | + List<String> childsId = new ArrayList<>(); | |
| 662 | + List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(userId); | |
| 663 | + if (CollectionUtils.isNotEmpty(permissionsModelList)) | |
| 664 | + { | |
| 665 | + String permission = permissionsModelList.get(0).getAreaPermission(); | |
| 666 | + if (StringUtils.isNotEmpty(permission)) { | |
| 667 | + List<Map> permissions = JsonUtil.toList(permission, Map.class); | |
| 668 | + if (CollectionUtils.isNotEmpty(permissions)) | |
| 669 | + { | |
| 670 | + for (Map map : permissions) | |
| 671 | + { | |
| 672 | + if (addrType == 1) | |
| 673 | + { | |
| 674 | + String c = String.valueOf(map.get("c")); | |
| 675 | + childsId.add(c); | |
| 676 | + } | |
| 677 | + else if (addrType == 2) | |
| 678 | + { | |
| 679 | + String a = String.valueOf(map.get("a")); | |
| 680 | + childsId.add(a); | |
| 681 | + } | |
| 682 | + | |
| 683 | + } | |
| 684 | + } | |
| 685 | + } | |
| 686 | + } | |
| 687 | + return childsId; | |
| 688 | + } | |
| 689 | + | |
| 690 | + /** | |
| 680 | 691 | * 占比计算 |
| 681 | 692 | * @param series |
| 682 | 693 | * @return |
| ... | ... | @@ -878,6 +889,9 @@ |
| 878 | 889 | { |
| 879 | 890 | countRequest.setExportType(3); |
| 880 | 891 | } |
| 892 | + | |
| 893 | + List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(userId); | |
| 894 | + String permission = permissionsModelList.get(0).getAreaPermission(); | |
| 881 | 895 | |
| 882 | 896 | |
| 883 | 897 | BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); |