From 076299149a0dcc6d1c768dda54a48fb98565dc26 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 9 Jun 2020 13:52:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=AF=E7=94=A8=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B0=86?= =?UTF-8?q?"=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E7=BA=A7=E5=85=B3=E7=B3=BB=E5=8C=BA=E5=88=86"=E7=9A=84?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=BB=98=E8=AE=A4=E8=BF=94=E5=9B=9E=E7=BB=99?= =?UTF-8?q?=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java | 4 ++++ .../main/java/com/epmet/service/impl/AccessServiceImpl.java | 3 +-- .../main/java/com/epmet/service/impl/AccessServiceImpl.java | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java index af13b14a3c..a7b1b2a7df 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/ListOpePermsFormDTO.java @@ -11,4 +11,8 @@ public class ListOpePermsFormDTO { private String staffId; @NotBlank(message = "当前单位不能为空") private String currAgencyId; + + private String currGridId; + + private String currDeptId; } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java index cc723cca1f..f47ac58ef4 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java @@ -546,8 +546,7 @@ public class AccessServiceImpl implements AccessService { } if (!opeScope.getSeries().equals(OperationScopeConstant.SERIES_ORG_LEVEL)) { - // 如果不是org_level系列权限，跳过。(如果一个操作没有分配org_level系列权限，那么无法根据所在机构判断是否具有该功能权限) - // 此时不会给前台返回此功能权限。即要求所有操作必须分配至少一个org_level系列权限(如果实在不需要，可以分配成org_all)。 + opeKeys.add(opeScope.getOperationKey()); continue; } diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java index 5f7926415b..d53204f039 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java @@ -27,6 +27,7 @@ public class AccessServiceImpl implements AccessService { ListOpePermsFormDTO listOpePermsFormDTO = new ListOpePermsFormDTO(); listOpePermsFormDTO.setStaffId(staffId); listOpePermsFormDTO.setCurrAgencyId(currAgencyId); + listOpePermsFormDTO.setCurrGridId(currGridId); Result> result = govAccessFeignClient.listOperationPermissions(listOpePermsFormDTO); if (!result.success()) { logger.error("调用GovAccess服务查询功能权限列表失败，StaffId:{}，错误信息:{}", staffId, result.getMsg());