From fc3419fd9d3fe0a410fe43b304fde50762b8d4e9 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Sun, 24 May 2020 23:03:05 +0800
Subject: [PATCH 1/8] =?UTF-8?q?1.=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=EF=BC=8C=E6=89=A9=E5=A4=A7=E4=B8=AA=E5=88=AB=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=86=85=E5=AD=98=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-auth/deploy/docker-compose-test.yml                     | 4 ++--
 .../main/java/com/epmet/dto/feign/GovAccessFeignClient.java   | 4 ++--
 .../gov-access-server/deploy/docker-compose-test.yml          | 4 ++--
 .../gov-grid/gov-grid-server/deploy/docker-compose-test.yml   | 4 ++--
 .../gov-issue/gov-issue-server/deploy/docker-compose-test.yml | 4 ++--
 .../gov-org/gov-org-server/deploy/docker-compose-test.yml     | 4 ++--
 .../gov-project-server/deploy/docker-compose-test.yml         | 4 ++--
 .../main/java/com/epmet/feign/OperCustomizeFeignClient.java   | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml
index fc62897cb3..db1f9bf682 100644
--- a/epmet-auth/deploy/docker-compose-test.yml
+++ b/epmet-auth/deploy/docker-compose-test.yml
@@ -9,9 +9,9 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 250M
\ No newline at end of file
+          memory: 400M
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java
index 3492e75587..71cee78b70 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java
@@ -8,8 +8,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-//@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovAccessFeignClientFallBack.class)
-@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovAccessFeignClientFallBack.class, url = "localhost:8099")
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovAccessFeignClientFallBack.class)
+//@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovAccessFeignClientFallBack.class, url = "localhost:8099")
 public interface GovAccessFeignClient {
 
     /**
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
index 3c42ac538e..3f13748bde 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
@@ -9,9 +9,9 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 250M
\ No newline at end of file
+          memory: 400M
\ No newline at end of file
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
index d7acafa8de..45bf3436e9 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
@@ -9,9 +9,9 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 300M
\ No newline at end of file
+          memory: 400M
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
index 5f836b9b3d..0a145f8c4a 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
@@ -9,9 +9,9 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 250M
\ No newline at end of file
+          memory: 400M
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
index a8cbd8bc33..60493ad2c1 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
@@ -9,9 +9,9 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 300M
\ No newline at end of file
+          memory: 400M
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
index f18a6283c8..da599dd5e7 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
@@ -9,9 +9,9 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 250M
\ No newline at end of file
+          memory: 400M
\ No newline at end of file
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
index a7f67f48cb..b3c13859b7 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
@@ -18,8 +18,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class, url = "localhost:8089")
-//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class)
+//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class, url = "localhost:8089")
+@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class)
 public interface OperCustomizeFeignClient {
 
     /**

From d76c022bcc7b369a403b320270e9cbeb698b427f Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Sun, 24 May 2020 23:06:29 +0800
Subject: [PATCH 2/8] =?UTF-8?q?1.=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-auth/deploy/docker-compose-dev.yml                        | 2 +-
 epmet-auth/deploy/docker-compose-test.yml                       | 2 +-
 epmet-auth/pom.xml                                              | 2 +-
 .../gov-access/gov-access-server/deploy/docker-compose-dev.yml  | 2 +-
 .../gov-access/gov-access-server/deploy/docker-compose-test.yml | 2 +-
 epmet-module/gov-access/gov-access-server/pom.xml               | 2 +-
 .../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml      | 2 +-
 .../gov-grid/gov-grid-server/deploy/docker-compose-test.yml     | 2 +-
 epmet-module/gov-grid/gov-grid-server/pom.xml                   | 2 +-
 .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml    | 2 +-
 .../gov-issue/gov-issue-server/deploy/docker-compose-test.yml   | 2 +-
 epmet-module/gov-issue/gov-issue-server/pom.xml                 | 2 +-
 .../gov-org/gov-org-server/deploy/docker-compose-dev.yml        | 2 +-
 .../gov-org/gov-org-server/deploy/docker-compose-test.yml       | 2 +-
 epmet-module/gov-org/gov-org-server/pom.xml                     | 2 +-
 .../gov-project-server/deploy/docker-compose-dev.yml            | 2 +-
 .../gov-project-server/deploy/docker-compose-test.yml           | 2 +-
 epmet-module/gov-project/gov-project-server/pom.xml             | 2 +-
 .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml      | 2 +-
 .../oper-crm/oper-crm-server/deploy/docker-compose-test.yml     | 2 +-
 epmet-module/oper-crm/oper-crm-server/pom.xml                   | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml
index 17251744b4..c09782692c 100644
--- a/epmet-auth/deploy/docker-compose-dev.yml
+++ b/epmet-auth/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.11
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.12
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络
diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml
index db1f9bf682..7d50f4b735 100644
--- a/epmet-auth/deploy/docker-compose-test.yml
+++ b/epmet-auth/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.11
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.12
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 6419876640..036aeea2f0 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.11</version>
+    <version>0.3.12</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
index ba0658398f..c308abed16 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.13
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.14
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
index 3f13748bde..ad7d331577 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.13
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.14
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml
index 8bdca567b0..57712195d0 100644
--- a/epmet-module/gov-access/gov-access-server/pom.xml
+++ b/epmet-module/gov-access/gov-access-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.13</version>
+    <version>0.3.14</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index 038e0b700c..d3aad3f4c4 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-grid-server:
     container_name: gov-grid-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.22
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.23
     ports:
       - "8097:8097"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
index 45bf3436e9..552bf1a18e 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-grid-server:
     container_name: gov-grid-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.22
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.23
     ports:
       - "8097:8097"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index fb1a970dc9..cf2ba0e960 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.22</version>
+    <version>0.3.23</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-grid</artifactId>
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
index b07e89d2fa..735235df5f 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-issue-server:
     container_name: gov-issue-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.25
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.26
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
index 0a145f8c4a..4380b18cc4 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-issue-server:
     container_name: gov-issue-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.25
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.26
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index e3e016c40b..57ccdb8f54 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.25</version>
+    <version>0.3.26</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
index 4a993c36f7..2654a1955d 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.51
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.52
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
index 60493ad2c1..d92fb192fe 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.51
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.52
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 7d18642312..157ff219f3 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.51</version>
+    <version>0.3.52</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
index 02571f7d28..2095bc48cb 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.16
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.17
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
index da599dd5e7..6c880afdcf 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.16
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.17
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index 2a5fe0743d..1bca572db5 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.16</version>
+    <version>0.3.17</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
index 11e49caf66..144e04daca 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.13
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.14
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
index 286721694b..12c9d72b3f 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.13
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.14
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index be5793a860..fe955fa644 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.13</version>
+    <version>0.3.14</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>

From 9009aa12ad7f2f6ab7c59068caebce6a080ee640 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 25 May 2020 00:16:13 +0800
Subject: [PATCH 3/8] =?UTF-8?q?1.=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml  | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +-
 epmet-user/epmet-user-server/pom.xml                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index 14ba3781ca..f474b9f846 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.37
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.38
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
index f631f4328d..dea2ed82ea 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.37
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.38
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index c904b16704..391d590b7c 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.37</version>
+    <version>0.3.38</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From f69ef701d2865293c7947965927f3a288f23f505 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 25 May 2020 01:07:01 +0800
Subject: [PATCH 4/8] =?UTF-8?q?1.=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java | 1 -
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml      | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-test.yml     | 2 +-
 epmet-user/epmet-user-server/pom.xml                            | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java
index 71cee78b70..546b6c14a3 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java
@@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovAccessFeignClientFallBack.class)
-//@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovAccessFeignClientFallBack.class, url = "localhost:8099")
 public interface GovAccessFeignClient {
 
     /**
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index f474b9f846..3c20fad90b 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.38
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.39
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
index dea2ed82ea..c286e95668 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.38
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.39
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 391d590b7c..0534bd820e 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.38</version>
+    <version>0.3.39</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From 1f85bb2bf32ba5c228830658dab0145d0614b6ba Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 25 May 2020 01:20:26 +0800
Subject: [PATCH 5/8] =?UTF-8?q?1.=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml      | 2 +-
 epmet-user/epmet-user-server/deploy/docker-compose-test.yml     | 2 +-
 epmet-user/epmet-user-server/pom.xml                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java
index 546b6c14a3..b30419dd56 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java
@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovAccessFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = GovAccessFeignClientFallBack.class)
 public interface GovAccessFeignClient {
 
     /**
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index 3c20fad90b..b866c80f11 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.39
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.40
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
index c286e95668..ed7310d3a8 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.39
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.40
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 0534bd820e..cbbdab7b2e 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.39</version>
+    <version>0.3.40</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From a7a3572caf5610b099aba54bf8428ddbbcc64fc1 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 25 May 2020 09:40:21 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=9B=AD=E5=9C=B0-?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E8=AE=AE=E9=A2=98=E3=80=81=E7=BB=93=E6=A1=88?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=9A=E5=8A=A1=E8=B0=83=E6=95=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/LatestIssueListResultDTO.java  | 17 +++++----
 .../src/main/java/com/epmet/dao/IssueDao.java |  4 ---
 .../epmet/dao/IssueVoteStatisticalDao.java    |  7 ----
 .../epmet/service/impl/IssueServiceImpl.java  | 36 ++++++++-----------
 .../mapper/IssueVoteStatisticalDao.xml        | 11 ------
 .../epmet/dto/result/LatestListResultDTO.java |  8 ++---
 .../com/epmet/constant/ProjectConstant.java   |  4 +--
 .../com/epmet/feign/EpmetUserFeignClient.java | 11 ------
 .../EpmetUserFeignClientFallBack.java         |  5 ---
 .../service/impl/ProjectServiceImpl.java      | 24 ++-----------
 .../src/main/resources/mapper/ProjectDao.xml  |  3 +-
 .../controller/CustomerStaffController.java   | 18 ----------
 .../epmet/service/CustomerStaffService.java   | 16 +--------
 .../impl/CustomerStaffServiceImpl.java        | 27 --------------
 14 files changed, 37 insertions(+), 154 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java
index 1c4fe33e19..13826f91e2 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java
@@ -21,16 +21,21 @@ public class LatestIssueListResultDTO implements Serializable {
      * 议题标题
      */
     private String issueTitle = "";
-    /**
-     * 议题发起人：XX路-XX先生
-     */
-    private String issuePublisherName = "";
     /**
      * 话题内容
      */
     private String topicContent = "";
     /**
-     * 表达态度总人数
+     * 用户头像
+     */
+    private String staffHeadPhoto = "";
+    /**
+     * 议题发起人：XX路-XX先生/女士
+     *
+     */
+    private String issuePublisherName = "";
+    /**
+     * 议题创建时间
      */
-    private Integer votedCount = 0;
+    private Long createIssueTime;
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
index 8fc76e1b85..377c731120 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
@@ -20,10 +20,6 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IssueDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.ClosedIssueListGovResultDTO;
-import com.epmet.dto.result.ClosedIssueListResultDTO;
-import com.epmet.dto.result.IssueResultDTO;
-import com.epmet.dto.result.VotingIssueListResultDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IssueEntity;
 import org.apache.ibatis.annotations.Mapper;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
index 949d0c14fa..134ec32bb1 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
@@ -68,13 +68,6 @@ public interface IssueVoteStatisticalDao extends BaseDao<IssueVoteStatisticalEnt
      */
     List<PolyLineDTO> polyLineData(IssueIdFormDTO issueId);
 
-    /**
-     * @param issueIdList
-     * @return
-     * @Author sun
-     * @Description 根据议题Id查询议题投票情况
-     **/
-    List<IssueVoteStatisticalEntity> selectListByissueId(@Param("issueIdList") List<String> issueIdList);
     /**
      * @Description 得到表决中的议题 来进行缓存与数据库的同步
      * @param
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 632017e990..b310d78e48 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -605,22 +605,24 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
         //1:根据已结案项目列表查询议题项目关系表数据
         List<IssueProjectRelationEntity> listRelation = issueProjectRelationDao.selectRelationList(projectIdList);
-        if(null==listRelation||listRelation.size()<NumConstant.ONE){
+        if (null == listRelation || listRelation.size() < NumConstant.ONE) {
             throw new RenException(IssueConstant.SELECT_ISSUEPROJECTRELATION_EXCEPTION);
         }
         List<String> issueIdList = listRelation.stream().map(IssueProjectRelationEntity::getIssueId).collect(Collectors.toList());
 
         //2:根据查询条件筛选出客户网格下已结案项目对应的议题详情列表
         LatestListFormDTO latestListForm = formDTO.getLatestListForm();
-        latestListForm.setPageNo((latestListForm.getPageNo()-NumConstant.ONE)*latestListForm.getPageSize());
+        latestListForm.setPageNo((latestListForm.getPageNo() - NumConstant.ONE) * latestListForm.getPageSize());
         List<IssueEntity> entityList = baseDao.selectIssueList(issueIdList, latestListForm);
-
+        if (null == entityList || entityList.size() < NumConstant.ONE) {
+            throw new RenException(IssueConstant.SELECT_EXCEPTION);
+        }
         //3:遍历封装数据
-        entityList.forEach(issue->{
-            listRelation.forEach(relation->{
-                if(relation.getIssueId().equals(issue.getId())){
-                    formDTO.getLatestListResult().forEach(project->{
-                        if(relation.getProjectId().equals(project.getProjectId())){
+        entityList.forEach(issue -> {
+            listRelation.forEach(relation -> {
+                if (relation.getIssueId().equals(issue.getId())) {
+                    formDTO.getLatestListResult().forEach(project -> {
+                        if (relation.getProjectId().equals(project.getProjectId())) {
                             LatestListResultDTO latest = ConvertUtils.sourceToTarget(project, LatestListResultDTO.class);
                             latest.setIssueId(issue.getId());
                             latest.setIssueTitle(issue.getIssueTitle());
@@ -649,11 +651,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             return returnList;
         }
 
-        //2:根据议题Id查询议题投票情况
-        List<String> issueIdList = entityList.stream().map(IssueEntity::getId).collect(Collectors.toList());
-        List<IssueVoteStatisticalEntity> StatisticalList = issueVoteStatisticalDao.selectListByissueId(issueIdList);
-
-        //3:调用epmet-user服务，查询议题发起人基本信息
+        //2:调用epmet-user服务，查询议题发起人基本信息
         List<String> userIdList = entityList.stream().map(IssueEntity::getCreatedBy).collect(Collectors.toList());
         UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
         userResiInfoListFormDTO.setUserIdList(userIdList);
@@ -663,7 +661,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
         List<UserResiInfoResultDTO> userInfoList = listResult.getData();
 
-        //4:调用resi-group服务，批量查询话题内容
+        //3:调用resi-group服务，批量查询话题内容
         List<String> topicIdList = entityList.stream().map(IssueEntity::getSourceId).collect(Collectors.toList());
         Result<List<ResiTopicDTO>> resultTopicList = resiGroupFeignClient.getTopicList(topicIdList);
         if (!resultTopicList.success() || null == resultTopicList.getData()) {
@@ -671,19 +669,15 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
         List<ResiTopicDTO> topicList = resultTopicList.getData();
 
-        //5:遍历组装对象
+        //4:遍历组装对象
         entityList.forEach(issue -> {
             LatestIssueListResultDTO resultDTO = new LatestIssueListResultDTO();
             resultDTO.setIssueId(issue.getId());
             resultDTO.setIssueTitle(issue.getIssueTitle());
-            StatisticalList.forEach(sta -> {
-                if (issue.getId().equals(sta.getIssueId())) {
-                    //表达态度总人数
-                    resultDTO.setVotedCount(sta.getSupportCount() + sta.getOppositionCount());
-                }
-            });
+            resultDTO.setCreateIssueTime(issue.getCreatedTime().getTime()/1000);
             userInfoList.forEach(user -> {
                 if (issue.getCreatedBy().equals(user.getUserId())) {
+                    resultDTO.setStaffHeadPhoto(user.getHeadPhoto());
                     //话题发起人昵称
                     resultDTO.setIssuePublisherName(user.getShowName());
                 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
index 5d48526dfd..ac039d7cd0 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
@@ -69,17 +69,6 @@
             ORDER BY statistical_date ASC
     </select>
 
-    <select id="selectListByissueId" resultType="com.epmet.entity.IssueVoteStatisticalEntity">
-        SELECT
-            *
-        FROM
-            issue_vote_statistical
-        WHERE del_flag = '0'
-        <foreach item="issueId" collection="issueIdList" separator="OR" open="AND (" close=")" index="">
-            issue_id = #{issueId}
-        </foreach>
-    </select>
-
     <!-- 得到表决中的议题 来进行缓存与数据库的同步 -->
     <select id="getVotingIssuesStatisticalForSync" resultType="com.epmet.dto.IssueVoteStatisticalDTO" >
         SELECT
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java
index c649df3498..ceae957676 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java
@@ -31,12 +31,12 @@ public class LatestListResultDTO implements Serializable {
 	 */
 	private String publicReply = "";
 	/**
-	 * 结案人名称、实名显示
+	 * 结案的处理部门
 	 */
-	private String closeUserName = "";
+	private String departmentName = "";
 	/**
-	 * 结案人Id
+	 * 项目结案时间
 	 */
-	private String closeUserId = "";
+	private Long closeProjectTime;
 
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
index cd3369e41e..a2d77e8446 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
@@ -110,7 +110,7 @@ public interface ProjectConstant {
 	 */
 	String GOV = "gov";
 	/**
-	 * 调用epmet-user服务获取工作人员信息失败
+	 * 获取项目节点数据失败
 	 */
-	String SELECT_STAFF_EXCEPTION = "获取工作人员信息失败";
+	String SELECT_process_EXCEPTION = "获取项目节点数据失败";
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index c9d448b532..60509eb2ae 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -5,13 +5,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.result.CustomerStaffListResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
-import com.epmet.dto.result.StaffListResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -52,12 +49,4 @@ public interface EpmetUserFeignClient {
     @PostMapping(value = "epmetuser/customerstaff/getstaffinfobyuserid")
     Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(@RequestBody CustomerStaffDTO formDTO);
 
-    /**
-     * @param staffIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询工作人员基础信息
-     **/
-    @PostMapping(value = "epmetuser/customerstaff/getstafflistbyids", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result<List<StaffListResultDTO>> getStaffListByIds(@RequestBody List<String> staffIdList);
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
index 83b8781780..0e36af3db9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -7,7 +7,6 @@ import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
-import com.epmet.dto.result.StaffListResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
@@ -36,8 +35,4 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "CustomerStaffDTO", formDTO);
     }
 
-    @Override
-    public Result<List<StaffListResultDTO>> getStaffListByIds(List<String> staffIdList) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffListByIds", staffIdList);
-    }
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 7d0ab4a6a0..2b55312a72 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -574,32 +574,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 * @param formDTO
 	 * @return
 	 * @Author sun
-	 * @Description 获取客户下已结案项目列表，按结案时间倒序
+	 * @Description 获取客户下已结案项目列表，按结案时间倒序(结案时间、结案说明、处理部门)
 	 **/
 	@Override
 	public List<LatestListResultDTO> getClosedProjectList(LatestListFormDTO formDTO) {
-		List<LatestListResultDTO> resultList = new ArrayList<>();
-		//1:查询客户下已结案项目列表
-		List<LatestListResultDTO> listProject = baseDao.selectClosedProjectList(formDTO);
-		if(null==listProject||listProject.size()<NumConstant.ONE){
-			return resultList;
-		}
-		List<String> staffIdList = listProject.stream().map(LatestListResultDTO::getCloseUserId).collect(Collectors.toList());
-		//2:调用epmet-user服务，查询结案人员真实姓名
-		Result<List<StaffListResultDTO>> listResult = epmetUserFeignClient.getStaffListByIds(staffIdList);
-		if (!listResult.success() || null == listResult.getData()) {
-			throw new RenException(ProjectConstant.SELECT_STAFF_EXCEPTION);
-		}
-		List<StaffListResultDTO> staffList = listResult.getData();
-		resultList = listProject.stream().flatMap(project ->
-				staffList.stream().filter(staff ->
-						project.getCloseUserId().equals(staff.getStaffId())).map(latest -> {
-					LatestListResultDTO resultDTO = ConvertUtils.sourceToTarget(project, LatestListResultDTO.class);
-					resultDTO.setCloseUserName(latest.getStaffName());
-					return resultDTO;
-				})).collect(Collectors.toList());
 
-		return resultList;
+		return baseDao.selectClosedProjectList(formDTO);
 	}
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index 8341e62e49..0dad21111b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -153,7 +153,8 @@
         SELECT
             p.id AS "projectId",
             pro.public_reply AS "publicReply",
-            pro.created_by AS "closeUserId"
+            pro.department_name AS "departmentName",
+            UNIX_TIMESTAMP(pro.created_time) AS "closeProjectTime"
         FROM project p
         INNER JOIN project_process pro ON p.id = pro.project_id
         WHERE p.del_flag = '0'
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
index 547d18ca46..f77e5deb4d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
@@ -27,15 +27,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.excel.CustomerStaffExcel;
 import com.epmet.service.CustomerStaffService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -281,14 +273,4 @@ public class CustomerStaffController {
         return new Result<CustomerStaffListResultDTO>().ok(customerStaffService.getCustomerStaffList(staffIdList));
     }
 
-    /**
-     * @param staffIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询工作人员基础信息
-     **/
-    @PostMapping(value = "getstafflistbyids")
-    public Result<List<StaffListResultDTO>> getStaffListByIds(@RequestBody List<String> staffIdList){
-        return new Result<List<StaffListResultDTO>>().ok(customerStaffService.getStaffListByIds(staffIdList));
-    }
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
index ec3a7ea554..4f4908cf32 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
@@ -21,14 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CommonUserIdListFormDTO;
-import com.epmet.dto.form.CustomerStaffFormDTO;
-import com.epmet.dto.form.StaffInfoFromDTO;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.form.DepartmentInStaffFormDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerStaffEntity;
 
@@ -232,11 +225,4 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 **/
 	CustomerStaffListResultDTO getCustomerStaffList(List<String> staffIdList);
 
-	/**
-	 * @param staffIdList
-	 * @return
-	 * @Author sun
-	 * @Description 批量查询工作人员基础信息
-	 **/
-	List<StaffListResultDTO> getStaffListByIds(List<String> staffIdList);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index c46254d83f..ba47befa3f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -35,22 +35,6 @@ import com.epmet.dao.StaffRoleDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.dto.form.*;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.GovStaffRoleDTO;
-import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.StaffRoleDTO;
-import com.epmet.dto.result.StaffDetailResultDTO;
-import com.epmet.dto.result.DepartInStaffListResultDTO;
-import com.epmet.dto.result.StaffInfoResultDTO;
-import com.epmet.dto.result.StaffInitResultDTO;
-import com.epmet.dto.result.StaffRoleResultDTO;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CustomerStaffFormDTO;
-import com.epmet.dto.result.CommonStaffInfoResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
 import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.entity.StaffRoleEntity;
@@ -440,15 +424,4 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		return list;
 	}
 
-	/**
-	 * @param staffIdList
-	 * @return
-	 * @Author sun
-	 * @Description 批量查询工作人员基础信息
-	 **/
-	@Override
-	public List<StaffListResultDTO> getStaffListByIds(List<String> staffIdList) {
-		return baseDao.selectStaffByIds(staffIdList);
-	}
-
 }
\ No newline at end of file

From f686c2e91993ec7d4685dde60785ce97ec76624f Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 25 May 2020 09:52:15 +0800
Subject: [PATCH 7/8] =?UTF-8?q?1.=E6=93=8D=E4=BD=9C=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=8C=83=E5=9B=B4=E5=B8=B8=E9=87=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/OperationScopeConstant.java      |  5 +++
 .../epmet/service/impl/AccessServiceImpl.java | 43 +++++++++----------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/constant/OperationScopeConstant.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/constant/OperationScopeConstant.java
index 02dd6664ff..f4aba15fbc 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/constant/OperationScopeConstant.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/constant/OperationScopeConstant.java
@@ -39,6 +39,11 @@ public class OperationScopeConstant {
     //"本组织"
     public static final String SCOPE_ORG_CURR = "org_curr";
 
+    //"本组织的上级"
+    public static final String SCOPE_ORG_CURR_SUP = "org_curr_sup";
+    //"本组织及上级"
+    public static final String SCOPE_ORG_CURR_AND_SUP = "org_curr_and_sup";
+
     //我创建的
     public static final String SCOPE_I_CREATED = "i_created";
     //网格内
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 b5ec4bd689..a56b4740fe 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
@@ -3,7 +3,6 @@ package com.epmet.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.epmet.bean.OpeScopeFilterResultBean;
 import com.epmet.commons.tools.constant.AppClientConstant;
-import com.epmet.commons.tools.constant.OpeScopeConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
@@ -175,7 +174,7 @@ public class AccessServiceImpl implements AccessService {
         Set<String> switchScopes = effectiveOpeScopes.getSwitchScopes();
 
         // 生成组织上下级关系系列的sql过滤片段
-        if (!CollectionUtil.isEmpty(orgLevelScopes) && !orgLevelScopes.contains(OpeScopeConstant.ORG_ALL)) {
+        if (!CollectionUtil.isEmpty(orgLevelScopes) && !orgLevelScopes.contains(OperationScopeConstant.SCOPE_ORG_ALL)) {
             genOrgLevelScopeSqlFilter(sb, orgLevelScopes, userDetails.getOrgIdPath(), form.getTableAlias());
         }
 
@@ -316,7 +315,7 @@ public class AccessServiceImpl implements AccessService {
 
         for (RoleOpeScopeResultDTO scope : scopeDTOS) {
 
-            if (OpeScopeConstant.ALL.equals(scope.getScopeKey())) {
+            if (OperationScopeConstant.SCOPE_ALL.equals(scope.getScopeKey())) {
                 all = true;
                 break;
             }
@@ -327,7 +326,7 @@ public class AccessServiceImpl implements AccessService {
             }
 
             String scopeIndex = scope.getScopeIndex();
-            if (OpeScopeConstant.ORG_ALL.equals(scope.getScopeKey())) {
+            if (OperationScopeConstant.SCOPE_ORG_ALL.equals(scope.getScopeKey())) {
                 // 该操作具有org_all的权限，直接放入
                 orgLevelScopes.put(scopeIndex, scope);
                 continue;
@@ -378,7 +377,7 @@ public class AccessServiceImpl implements AccessService {
         for (String scope : scopes) {
             switch (scope) {
                 // 当前单位(可以用ORG_ID_PATH，也可以用ORG_ID判断)
-                case OpeScopeConstant.ORG_CURR:
+                case OperationScopeConstant.SCOPE_ORG_CURR:
                     if (StringUtils.isBlank(tableAlias)) {
                         sb.append(" ORG_ID_PATH = '").append(orgIdPath).append("' OR ");
                         //sb.append(" ORG_ID = '").append(currOrgID).append("' OR ");
@@ -388,7 +387,7 @@ public class AccessServiceImpl implements AccessService {
                     }
                     break;
                 //    本单位及其子级单位
-                case OpeScopeConstant.ORG_CURR_AND_SUB:
+                case OperationScopeConstant.SCOPE_ORG_CURR_AND_SUB:
                     if (StringUtils.isBlank(tableAlias)) {
                         sb.append(" ORG_ID_PATH like '").append(orgIdPath).append("%' OR ");
                     } else {
@@ -396,7 +395,7 @@ public class AccessServiceImpl implements AccessService {
                     }
                     break;
                 //    本单位的子级单位
-                case OpeScopeConstant.ORG_CURR_SUB:
+                case OperationScopeConstant.SCOPE_ORG_CURR_SUB:
                     if (StringUtils.isBlank(tableAlias)) {
                         sb.append(" ORG_ID_PATH like '").append(orgIdPath).append(":%' OR ");
                     } else {
@@ -404,7 +403,7 @@ public class AccessServiceImpl implements AccessService {
                     }
                     break;
                 //当前单位的父级单位
-                case OpeScopeConstant.ORG_CURR_SUP:
+                case OperationScopeConstant.SCOPE_ORG_CURR_SUP:
                     if (StringUtils.isBlank(tableAlias)) {
                         sb.append(" '").append(orgIdPath).append("' like CONCAT(").append("ORG_ID_PATH,':%') OR ");
                     } else {
@@ -412,30 +411,30 @@ public class AccessServiceImpl implements AccessService {
                     }
                     break;
                 //    当前单位及其父级单位
-                case OpeScopeConstant.ORG_CURR_AND_SUP:
+                case OperationScopeConstant.SCOPE_ORG_CURR_AND_SUP:
                     if (StringUtils.isBlank(tableAlias)) {
                         sb.append(" '").append(orgIdPath).append("' like CONCAT(").append("ORG_ID_PATH,'%') OR ");
                     } else {
                         sb.append(" '").append(orgIdPath).append("' like CONCAT(").append(tableAlias).append(".ORG_ID_PATH,'%' ) OR ");
                     }
                     break;
-                case OpeScopeConstant.ORG_EQUAL:
+                case OperationScopeConstant.SCOPE_ORG_EQUAL:
                     // todo 同级
                     //sb.append(" OR ");
                     break;
-                case OpeScopeConstant.ORG_EQUAL_AND_SUB:
+                case OperationScopeConstant.SCOPE_ORG_EQUAL_AND_SUB:
                     // todo 同级及其子级
                     //sb.append(" OR ");
                     break;
-                case OpeScopeConstant.ORG_EQUAL_SUB:
+                case OperationScopeConstant.SCOPE_ORG_EQUAL_SUB:
                     // todo 同级的子级
                     //sb.append(" OR ");
                     break;
-                case OpeScopeConstant.ORG_EQUAL_AND_SUP:
+                case OperationScopeConstant.SCOPE_ORG_EQUAL_AND_SUP:
                     // todo 同级及其上级
                     //sb.append(" OR ");
                     break;
-                case OpeScopeConstant.ORG_EQUAL_SUP:
+                case OperationScopeConstant.SCOPE_ORG_EQUAL_SUP:
                     // todo 同级的上级
                     //sb.append(" OR ");
                     break;
@@ -539,7 +538,7 @@ public class AccessServiceImpl implements AccessService {
         HashSet<String> opeKeys = new HashSet<>();
         for (RoleOpeScopeResultDTO opeScope : roleOperations) {
             String scopeKey = opeScope.getScopeKey();
-            if (OpeScopeConstant.ORG_ALL.equals(scopeKey) || OpeScopeConstant.ALL.equals(scopeKey)) {
+            if (OperationScopeConstant.SCOPE_ORG_ALL.equals(scopeKey) || OperationScopeConstant.SCOPE_ALL.equals(scopeKey)) {
                 // 如果该操作的范围是org_all或者all，不需要根据上下级关系判断，直接返回即可。
                 opeKeys.add(opeScope.getOperationKey());
                 continue;
@@ -553,21 +552,21 @@ public class AccessServiceImpl implements AccessService {
 
             switch (currOrgRelation) {
                 case ORG_RELATION_SAME:// 就在所在机构下
-                    if (OpeScopeConstant.ORG_CURR.equals(scopeKey)
-                            || OpeScopeConstant.ORG_CURR_AND_SUB.equals(scopeKey)
-                            || OpeScopeConstant.ORG_CURR_AND_SUP.equals(scopeKey)) {
+                    if (OperationScopeConstant.SCOPE_ORG_CURR.equals(scopeKey)
+                            || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUB.equals(scopeKey)
+                            || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUP.equals(scopeKey)) {
                         opeKeys.add(opeScope.getOperationKey());
                     }
                     break;
                 case ORG_RELATION_SUB:// 所在机构的子级
-                    if (OpeScopeConstant.ORG_CURR_SUB.equals(scopeKey)
-                            || OpeScopeConstant.ORG_CURR_AND_SUB.equals(scopeKey)) {
+                    if (OperationScopeConstant.SCOPE_ORG_CURR_SUB.equals(scopeKey)
+                            || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUB.equals(scopeKey)) {
                         opeKeys.add(opeScope.getOperationKey());
                     }
                     break;
                 case ORG_RELATION_SUP:// 所在机构的上级
-                    if (OpeScopeConstant.ORG_CURR_SUP.equals(scopeKey)
-                            || OpeScopeConstant.ORG_CURR_AND_SUP.equals(scopeKey)) {
+                    if (OperationScopeConstant.SCOPE_ORG_CURR_SUP.equals(scopeKey)
+                            || OperationScopeConstant.SCOPE_ORG_CURR_AND_SUP.equals(scopeKey)) {
                         opeKeys.add(opeScope.getOperationKey());
                     }
                     break;

From 9e872756a1acdeadea993587e4c5bf9f157466dc Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Mon, 25 May 2020 10:27:15 +0800
Subject: [PATCH 8/8] =?UTF-8?q?Vote=E7=BC=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/redis/IssueVoteDetailRedis.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
index 3692ef87b8..74a93deb8b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
@@ -40,6 +40,8 @@ import org.springframework.stereotype.Component;
 import java.lang.reflect.Field;
 import java.util.Map;
 
+import static com.epmet.commons.tools.redis.RedisUtils.NOT_EXPIRE;
+
 /**
  * 议题表决记录表
  *
@@ -75,7 +77,7 @@ public class IssueVoteDetailRedis {
         String key = IssueConstant.REDIS_KEY +vote.getIssueId();
         //bean to map
         Map<String, Object> map = BeanUtil.beanToMap(vote, false, true);
-        redisUtils.hMSet(key, map);
+        redisUtils.hMSet(key, map,NOT_EXPIRE);
     }
 
     public VoteRedisFormDTO get(String issueId){