From ea7d17e3bbf0d1640e6abb45c11f9969e1e74cc9 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 18 May 2020 20:33:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B0=86gov-mine=E7=9A=84=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=A1=E7=AE=97=E6=94=BE=E5=88=B0=E4=BA=86?=
 =?UTF-8?q?gov-access?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/gov-access/gov-access-server/pom.xml    | 12 ++++++++++++
 .../com/epmet/service/impl/AccessServiceImpl.java    |  2 ++
 .../java/com/epmet/feign/GovAccessFeignClient.java   |  2 +-
 .../com/epmet/service/CustomerAgencyService.java     |  1 +
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml
index f52504e33e..b45aab6aac 100644
--- a/epmet-module/gov-access/gov-access-server/pom.xml
+++ b/epmet-module/gov-access/gov-access-server/pom.xml
@@ -19,6 +19,18 @@
             <artifactId>gov-access-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-org-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
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 c74e8db9c0..28c9535f83 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
@@ -16,6 +16,8 @@ import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.GetSQLFilterFormDTO;
 import com.epmet.dto.form.StaffRoleFormDTO;
 import com.epmet.dto.result.RoleOpeScopeResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.RoleOpeScopeRedis;
 import com.epmet.service.AccessService;
 import org.apache.commons.lang3.StringUtils;
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovAccessFeignClient.java
index ff347a674c..6e0fabe86f 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovAccessFeignClient.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovAccessFeignClient.java
@@ -60,7 +60,7 @@ public interface GovAccessFeignClient {
      * 列出觉得的功能权限列表
      * @return
      */
-    @PostMapping("listoperationpermissions")
+    @PostMapping("/gov/access/access/listoperationpermissions")
     Result<Set<String>> listOperationPermissions(@RequestBody ListOpePermsFormDTO listOpePermsFormDTO);
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index b0babab2fc..6cc44ea483 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.AgencyDeptGridFormDTO;
+import com.epmet.dto.form.CanTickStaffListFormDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;