From b6642220f47bc49e7f4610833f9922f628db2906 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 30 Apr 2020 14:29:48 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BA=86=E6=9D=83=E9=99=90=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E5=99=A8=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=90=AF=E5=8A=A8=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E8=AF=BB=E5=8F=96RequirePermissionEnum?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=EF=BC=8C=E5=B0=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=84=E6=94=BE=E5=85=A5=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/config/PermissionInitializer.java   | 30 ----------
 epmet-gateway/pom.xml                         |  8 +--
 .../epmet/config/PermissionInitializer.java   | 60 +++++++++++++++++++
 .../main/java/com/epmet/dao/OperationDao.java | 36 +++++++++++
 .../com/epmet/entity/OperationEntity.java     | 56 +++++++++++++++++
 .../com/epmet/service/OperationService.java   | 13 ++++
 .../service/impl/OperationServiceImpl.java    | 29 +++++++++
 .../main/resources/mapper/OperationDao.xml    | 25 ++++++++
 8 files changed, 223 insertions(+), 34 deletions(-)
 delete mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/PermissionInitializer.java
 create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/PermissionInitializer.java
 create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationDao.java
 create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationEntity.java
 create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperationService.java
 create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java
 create mode 100644 epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationDao.xml

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/PermissionInitializer.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/PermissionInitializer.java
deleted file mode 100644
index b2908f242a..0000000000
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/PermissionInitializer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-//package com.epmet.commons.tools.config;
-//
-//import com.epmet.commons.tools.annotation.RequirePermission;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.context.ApplicationContext;
-//import org.springframework.context.annotation.Configuration;
-//
-//import javax.annotation.PostConstruct;
-//import java.util.Map;
-//
-//@Configuration
-//public class PermissionInitializer {
-//
-//    @Autowired
-//    private ApplicationContext applicationContext;
-//
-//    /**
-//     * 初始化操作权限
-//     */
-//    @PostConstruct
-//    public void initOpePermissions() {
-//        Map<String, Object> beanMap = applicationContext.getBeansWithAnnotation(RequirePermission.class);
-//        for (Map.Entry<String, Object> entry : beanMap.entrySet()) {
-//            System.out.println(entry);
-//        }
-//
-//    }
-//
-//
-//}
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 81c41a50ad..63fa8d143f 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -126,8 +126,8 @@
                 <gateway.routes.epmet-job-server.uri>lb://epmet-job-server</gateway.routes.epmet-job-server.uri>
 <!--                <gateway.routes.epmet-job-server.uri>http://127.0.0.1:8084</gateway.routes.epmet-job-server.uri>-->
                 <!--  8、用户模块              -->
-                                <gateway.routes.epmet-user-server.uri>lb://epmet-user-server</gateway.routes.epmet-user-server.uri>
-<!--                <gateway.routes.epmet-user-server.uri>http://127.0.0.1:8087</gateway.routes.epmet-user-server.uri>-->
+                <!--                <gateway.routes.epmet-user-server.uri>lb://epmet-user-server</gateway.routes.epmet-user-server.uri>-->
+                <gateway.routes.epmet-user-server.uri>http://127.0.0.1:8087</gateway.routes.epmet-user-server.uri>
                 <!--  9、新模块结构demo  -->
 <!--                <gateway.routes.epmet-demo-server.uri>lb://epmet-demo-server</gateway.routes.epmet-demo-server.uri>-->
                 <gateway.routes.epmet-demo-server.uri>http://127.0.0.1:8088</gateway.routes.epmet-demo-server.uri>
@@ -141,8 +141,8 @@
                 <gateway.routes.resi-guide-server.uri>lb://resi-guide-server</gateway.routes.resi-guide-server.uri>
 <!--                <gateway.routes.resi-guide-server.uri>http://127.0.0.1:8091</gateway.routes.resi-guide-server.uri>-->
                 <!--   13、政府组织管理   -->
-                <gateway.routes.gov-org-server.uri>lb://gov-org-server</gateway.routes.gov-org-server.uri>
-<!--                <gateway.routes.gov-org-server.uri>http://127.0.0.1:8092</gateway.routes.gov-org-server.uri>-->
+                <!--<gateway.routes.gov-org-server.uri>lb://gov-org-server</gateway.routes.gov-org-server.uri>-->
+                <gateway.routes.gov-org-server.uri>http://127.0.0.1:8092</gateway.routes.gov-org-server.uri>
                 <!--   14、#运营端访问权限控制   -->
                 <gateway.routes.oper-access-server.uri>lb://oper-access-server</gateway.routes.oper-access-server.uri>
 <!--                <gateway.routes.oper-access-server.uri>http://127.0.0.1:8093</gateway.routes.oper-access-server.uri>-->
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/PermissionInitializer.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/PermissionInitializer.java
new file mode 100644
index 0000000000..a88f27c992
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/PermissionInitializer.java
@@ -0,0 +1,60 @@
+package com.epmet.config;
+
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.entity.OperationEntity;
+import com.epmet.service.OperationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.PostConstruct;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Configuration
+public class PermissionInitializer {
+
+    @Autowired
+    private OperationService operationService;
+
+    /**
+     * 初始化操作权限
+     */
+    @PostConstruct
+    public void initOpePermissions() {
+        Set<String> operationKeys = getExistsOperationKeys();
+
+        ArrayList<OperationEntity> operations2Create = new ArrayList<>();
+
+        RequirePermissionEnum[] requirePermissionEnums = RequirePermissionEnum.values();
+        Arrays.stream(requirePermissionEnums).forEach(perm -> {
+            String key = perm.getKey();
+            if (!operationKeys.contains(key)) {
+                OperationEntity operationEntity = new OperationEntity();
+                operationEntity.setOperationKey(key);
+                operationEntity.setBrief(perm.getBrief());
+                operationEntity.setOperationName(perm.getName());
+                operations2Create.add(operationEntity);
+            }
+        });
+
+        if (!CollectionUtils.isEmpty(operations2Create)) {
+            operationService.createBatch(operations2Create);
+        }
+    }
+
+    /**
+     * 获取现有的操作key列表
+     * @return
+     */
+    public Set<String> getExistsOperationKeys() {
+        List<OperationEntity> operationEntities = operationService.listAllOperations();
+        if (!CollectionUtils.isEmpty(operationEntities)) {
+            return operationEntities.stream().map(ope -> ope.getOperationKey()).collect(Collectors.toSet());
+        }
+        return new HashSet<>();
+    }
+
+
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationDao.java
new file mode 100644
index 0000000000..427d458215
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationDao.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.OperationEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 操作类型表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-04-30
+ */
+@Mapper
+public interface OperationDao extends BaseDao<OperationEntity> {
+
+    List<OperationEntity> listAllOperationEntities();
+}
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationEntity.java
new file mode 100644
index 0000000000..e599d8c28f
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationEntity.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 操作类型表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-04-30
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("operation")
+public class OperationEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String operationKey;
+
+    /**
+     * 
+     */
+	private String operationName;
+
+    /**
+     * 操作简介
+     */
+	private String brief;
+
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperationService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperationService.java
new file mode 100644
index 0000000000..26c9303bbe
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperationService.java
@@ -0,0 +1,13 @@
+package com.epmet.service;
+
+import com.epmet.entity.OperationEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public interface OperationService {
+
+    List<OperationEntity> listAllOperations();
+
+    void createBatch(ArrayList<OperationEntity> operations2Create);
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java
new file mode 100644
index 0000000000..ff20e3d2da
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperationServiceImpl.java
@@ -0,0 +1,29 @@
+package com.epmet.service.impl;
+
+import com.epmet.dao.OperationDao;
+import com.epmet.entity.OperationEntity;
+import com.epmet.service.OperationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class OperationServiceImpl implements OperationService {
+
+    @Autowired
+    private OperationDao operationDao;
+
+    @Override
+    public List<OperationEntity> listAllOperations() {
+        return operationDao.listAllOperationEntities();
+    }
+
+    @Transactional
+    @Override
+    public void createBatch(ArrayList<OperationEntity> operations2Create) {
+        operations2Create.forEach(ope -> operationDao.insert(ope));
+    }
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationDao.xml
new file mode 100644
index 0000000000..18669ed246
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationDao.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.OperationDao">
+
+    <resultMap type="com.epmet.entity.OperationEntity" id="operationMap">
+        <result property="id" column="ID"/>
+        <result property="operationKey" column="OPERATION_KEY"/>
+        <result property="operationName" column="OPERATION_NAME"/>
+        <result property="brief" column="BRIEF"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <select id="listAllOperationEntities" resultType="com.epmet.entity.OperationEntity">
+        SELECT o.*
+        FROM operation o
+    </select>
+
+
+</mapper>
\ No newline at end of file

From 8b90998be720510a04ec81ec1441d7e6b4f134fa Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 30 Apr 2020 14:40:00 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=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-module/gov-access/gov-access-server/docker-compose.yml    | 2 +-
 epmet-module/gov-access/gov-access-server/pom.xml               | 2 +-
 epmet-module/gov-grid/gov-grid-server/docker-compose.yml        | 2 +-
 epmet-module/gov-grid/gov-grid-server/pom.xml                   | 2 +-
 epmet-module/gov-mine/gov-mine-server/docker-compose.yml        | 2 +-
 epmet-module/gov-mine/gov-mine-server/pom.xml                   | 2 +-
 epmet-module/gov-org/gov-org-server/docker-compose.yml          | 2 +-
 epmet-module/gov-org/gov-org-server/pom.xml                     | 2 +-
 epmet-module/oper-access/oper-access-server/docker-compose.yml  | 2 +-
 epmet-module/oper-access/oper-access-server/pom.xml             | 2 +-
 epmet-module/oper-crm/oper-crm-server/docker-compose.yml        | 2 +-
 epmet-module/oper-crm/oper-crm-server/pom.xml                   | 2 +-
 .../oper-customize/oper-customize-server/docker-compose.yml     | 2 +-
 epmet-module/oper-customize/oper-customize-server/pom.xml       | 2 +-
 epmet-module/resi-group/resi-group-server/docker-compose.yml    | 2 +-
 epmet-module/resi-group/resi-group-server/pom.xml               | 2 +-
 epmet-module/resi-guide/resi-guide-server/docker-compose.yml    | 2 +-
 epmet-module/resi-guide/resi-guide-server/pom.xml               | 2 +-
 epmet-module/resi-mine/resi-mine-server/docker-compose.yml      | 2 +-
 epmet-module/resi-mine/resi-mine-server/pom.xml                 | 2 +-
 .../resi-partymember/resi-partymember-server/docker-compose.yml | 2 +-
 epmet-module/resi-partymember/resi-partymember-server/pom.xml   | 2 +-
 epmet-user/epmet-user-server/docker-compose.yml                 | 2 +-
 epmet-user/epmet-user-server/pom.xml                            | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/epmet-module/gov-access/gov-access-server/docker-compose.yml b/epmet-module/gov-access/gov-access-server/docker-compose.yml
index f718b955d9..c0ee5d46af 100644
--- a/epmet-module/gov-access/gov-access-server/docker-compose.yml
+++ b/epmet-module/gov-access/gov-access-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.5
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.6
     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 236e3e4779..55bb36dfe0 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.5</version>
+    <version>0.3.6</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml
index 83fde4e92b..168e285ce4 100644
--- a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml
+++ b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-grid-server:
     container_name: gov-grid-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.10
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.11
     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 60f67b62a8..617c7fe7ce 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.10</version>
+    <version>0.3.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-grid</artifactId>
diff --git a/epmet-module/gov-mine/gov-mine-server/docker-compose.yml b/epmet-module/gov-mine/gov-mine-server/docker-compose.yml
index d6909ad07f..27c711fc44 100644
--- a/epmet-module/gov-mine/gov-mine-server/docker-compose.yml
+++ b/epmet-module/gov-mine/gov-mine-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.7
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.8
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml
index 5f48b69c93..0eb920057f 100644
--- a/epmet-module/gov-mine/gov-mine-server/pom.xml
+++ b/epmet-module/gov-mine/gov-mine-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.7</version>
+    <version>0.3.8</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-mine</artifactId>
diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml
index 8c86af7e94..12b9650f11 100644
--- a/epmet-module/gov-org/gov-org-server/docker-compose.yml
+++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.26
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.27
     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 d51e8e368b..82a7cfc712 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.26</version>
+    <version>0.3.27</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>
diff --git a/epmet-module/oper-access/oper-access-server/docker-compose.yml b/epmet-module/oper-access/oper-access-server/docker-compose.yml
index 61d6756b90..5cfa3206cd 100644
--- a/epmet-module/oper-access/oper-access-server/docker-compose.yml
+++ b/epmet-module/oper-access/oper-access-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-access-server:
     container_name: oper-access-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:0.3.3
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:0.3.4
     ports:
       - "8093:8093"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml
index f09cd3015d..55dbb0f047 100644
--- a/epmet-module/oper-access/oper-access-server/pom.xml
+++ b/epmet-module/oper-access/oper-access-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">
 
-    <version>0.3.3</version>
+    <version>0.3.4</version>
     <parent>
         <artifactId>oper-access</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/oper-crm/oper-crm-server/docker-compose.yml b/epmet-module/oper-crm/oper-crm-server/docker-compose.yml
index 75883a89ed..01275c1887 100644
--- a/epmet-module/oper-crm/oper-crm-server/docker-compose.yml
+++ b/epmet-module/oper-crm/oper-crm-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-crm-server:0.3.4
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-crm-server:0.3.5
     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 a0529f4f4d..1a911314f8 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.4</version>
+    <version>0.3.5</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>
diff --git a/epmet-module/oper-customize/oper-customize-server/docker-compose.yml b/epmet-module/oper-customize/oper-customize-server/docker-compose.yml
index 2978e0bc66..b4cbdaf8d4 100644
--- a/epmet-module/oper-customize/oper-customize-server/docker-compose.yml
+++ b/epmet-module/oper-customize/oper-customize-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-customize-server:0.3.3
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-customize-server:0.3.4
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml
index dbfcd30b63..b6dd6c5007 100644
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-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.3</version>
+    <version>0.3.4</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>
diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml
index eb3bd4926b..c012118682 100644
--- a/epmet-module/resi-group/resi-group-server/docker-compose.yml
+++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.10
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.11
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 13cc13e781..39f0317030 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-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.10</version>
+    <version>0.3.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>
diff --git a/epmet-module/resi-guide/resi-guide-server/docker-compose.yml b/epmet-module/resi-guide/resi-guide-server/docker-compose.yml
index a59cc76276..8cc981ff60 100644
--- a/epmet-module/resi-guide/resi-guide-server/docker-compose.yml
+++ b/epmet-module/resi-guide/resi-guide-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-guide-server:
     container_name: resi-guide-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-guide-server:0.3.3
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-guide-server:0.3.4
     ports:
       - "8091:8091"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml
index a14f57ff89..b3cc31066a 100644
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-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.3</version>
+    <version>0.3.4</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-guide</artifactId>
diff --git a/epmet-module/resi-mine/resi-mine-server/docker-compose.yml b/epmet-module/resi-mine/resi-mine-server/docker-compose.yml
index a8d5079c22..fafecfb784 100644
--- a/epmet-module/resi-mine/resi-mine-server/docker-compose.yml
+++ b/epmet-module/resi-mine/resi-mine-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.5
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.6
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
index f24b5d71c5..54fee47362 100644
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-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.5</version>
+    <version>0.3.6</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>
diff --git a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml
index c62dfd9f51..5a1971d1d8 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.10
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.11
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 5f6dc57fca..da9e3f88a0 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-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.10</version>
+    <version>0.3.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>
diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml
index 86efa9857e..e704e32fb7 100644
--- a/epmet-user/epmet-user-server/docker-compose.yml
+++ b/epmet-user/epmet-user-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.19
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.20
     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 e24d852884..08c05bf0fd 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.19</version>
+    <version>0.3.20</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From 35b4cdcd5f3016dacc7ce69e462225fbae8b2b66 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 30 Apr 2020 14:46:00 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A4=B4=E5=83=8Fbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/group/service/impl/ResiGroupServiceImpl.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 0289f53934..022eb30346 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -761,7 +761,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		Result<List<UserResiInfoResultDTO>> userInfoResult =
 		epmetUserFeignClient.getUserResiInfoList(new UserResiInfoListFormDTO(userId));
 		if(userInfoResult.success() && null != userInfoResult.getData() && userInfoResult.getData().size() >= 1){
-			detail.setGroupHeadPhoto(userInfoResult.getData().get(0).getHeadPhoto());
 			//姓氏+先生/女士 注:在数据库中拼接成[街道+显示名称]默认格式，故要进行截取
 			//detail.setGroupLeaderName(userInfoResult.getData().get(0).getShowName().split("-")[NumConstant.ONE]);
 			//姓氏+名称

From a3d53dffb9f5b2f4fd42c3d2b319c5cb8de56085 Mon Sep 17 00:00:00 2001
From: zxc <954985705@qq.com>
Date: Thu, 30 Apr 2020 14:52:01 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BC=83=E7=94=A8?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/CustomerGridDao.java   | 16 --------------
 .../com/epmet/feign/EpmetUserFeignClient.java |  8 -------
 .../EpmetUserFeignClientFallBack.java         |  5 -----
 .../main/resources/mapper/CustomerGridDao.xml | 22 -------------------
 .../controller/CustomerStaffController.java   |  6 -----
 .../java/com/epmet/dao/CustomerStaffDao.java  |  7 ------
 .../epmet/service/CustomerStaffService.java   | 10 ---------
 .../impl/CustomerStaffServiceImpl.java        |  9 --------
 .../resources/mapper/CustomerStaffDao.xml     | 16 --------------
 9 files changed, 99 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index 3451859f5c..ccf6d62ed9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -99,22 +99,6 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      */
     List<UserIdAndPidDTO> selectUserIdByGridId(CustomerGridFormDTO customerGridFormDTO);
 
-    /**
-     * 根据userId查询customerId
-     *
-     * @param userId
-     * @return
-     */
-    String selectCustomerIdByUserId(@Param("userId") String userId);
-
-    /**
-     * 根据pid查询pids
-     *
-     * @param pid
-     * @return
-     */
-    String selectPidsByPid(@Param("pid") String pid);
-
     /**
      * 根据gridName查询gridId
      *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 1147f23ae6..2f9fbb99c9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -140,14 +140,6 @@ public interface EpmetUserFeignClient {
 	@PostMapping("/epmetuser/customerstaff/getdepartmentstafflist")
 	Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(@RequestBody DepartmentInStaffFormDTO departmentInStaffFormDTO);
 
-	/**
-	 *	根据userId查询customerId
-	 * @param  addDepartmentStaffFormDTO
-	 * @auther zxc
-	 */
-	@PostMapping("/epmetuser/customerstaff/selectcustomeridbyuserid")
-	Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO);
-
 	/**
 	 * @Description 通过userId列表查询未被禁用的用户信息
 	 * @Param CommonUserIdListFormDTO :: getUserIdList
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
index 0cffc90482..bac3fd9024 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -91,11 +91,6 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result disabledStaff(StaffInfoFromDTO fromDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "disabledStaff", fromDTO);
     }
-    @Override
-    public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectCustomerIdByUserId", addDepartmentStaffFormDTO);
-    }
-
 
     @Override
     public Result<List<CommonStaffInfoResultDTO>> enableStaffMsgList(CommonUserIdListFormDTO userIdList) {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 5e408d5cb9..aebba044c4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -157,28 +157,6 @@
 	        AND csg.grid_id = #{gridId}
     </select>
 
-    <!-- 根据userId查询customerId -->
-    <select id="selectCustomerIdByUserId" resultType="string">
-        SELECT
-            customer_id
-        FROM
-            customer_staff_grid
-        WHERE
-            user_id = #{userId}
-            LIMIT 1
-    </select>
-
-    <!-- 根据pid查询pids -->
-    <select id="selectPidsByPid" resultType="string">
-        SELECT
-            pids
-        FROM
-            customer_agency
-        WHERE
-            id = #{pid}
-            limit 1
-    </select>
-
     <!-- 根据gridName查询gridId -->
     <select id="selectGridIdByGridName" resultType="com.epmet.dto.result.AddGridResultDTO">
         SELECT
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 27fb54d1fe..ca2bd6d210 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
@@ -180,12 +180,6 @@ public class CustomerStaffController {
         return customerStaffService.selectGridStaffCountByUserId(userIdDTO);
     }
 
-
-    @PostMapping(value = "selectcustomeridbyuserid")
-    public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(@RequestBody AddDepartmentStaffFormDTO addDepartmentStaffFormDTO){
-        return customerStaffService.selectCustomerIdByUserId(addDepartmentStaffFormDTO);
-    }
-
     /**
      * 人员添加页面初始化
      *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
index 99fbc84718..7b056bfea2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
@@ -115,13 +115,6 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 */
     List<DepartInStaffListResultDTO> selectDepartmentStaffList(DepartmentInStaffFormDTO fromDTO);
 
-    /**
-     *
-     * @param  departmentStaffFormDTO
-     * @auther zxc
-     */
-    List<CustomerIdDTO> selectCustomerIdByUserId(AddDepartmentStaffFormDTO departmentStaffFormDTO);
-
     /**
      * @Description  根据UserId列表查询用信息，过滤掉被禁用的，包含未激活的
      * @Param List<String>
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 3acfbd9671..331cbf7223 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,12 +21,9 @@ 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.form.*;
 import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
 import com.epmet.dto.form.CommonUserIdListFormDTO;
-import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.dto.form.StaffInfoFromDTO;
 import com.epmet.dto.form.StaffSubmitFromDTO;
@@ -218,13 +215,6 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 */
 	Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO fromDTO);
 
-	/**
-	 *	根据userId查询customerId
-	 * @param:	addDepartmentStaffFormDTO
-	 * @auther: zxc
-	 */
-	Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO);
-
 	/**
 	 * @Description 通过userId列表查询未被禁用的用户信息
 	 * @Param CommonUserIdListFormDTO :: getUserIdList
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 3c079c624e..e6d681851e 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
@@ -403,15 +403,6 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		return new Result<List<DepartInStaffListResultDTO>>().ok(staffList);
 	}
 
-	/**
-	 * @param: addDepartmentStaffFormDTO
-	 * @auther: zxc
-	 */
-	@Override
-	public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) {
-		return new Result<List<CustomerIdDTO>>().ok(baseDao.selectCustomerIdByUserId(addDepartmentStaffFormDTO));
-	}
-
 	/**
 	 * @return Result<List < CommonStaffInfoResultDTO>>
 	 * @Description 通过userId列表查询未被禁用的用户信息
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index d947006ad0..6fbcd71df4 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -160,22 +160,6 @@
         ORDER BY CONVERT (real_name USING gbk) ASC<!--按中文对应的拼音升序排列-->
     </select>
 
-    <!-- 根据userId查询customerId -->
-    <select id="selectCustomerIdByUserId" parameterType="com.epmet.dto.form.AddDepartmentStaffFormDTO" resultType="com.epmet.dto.CustomerIdDTO">
-        SELECT
-            user_id AS userId,
-            customer_id AS customerId
-        FROM
-            customer_staff
-        WHERE
-            user_id in
-            <foreach item="item" collection="selectedList" separator="," open="(" close=")" index="">
-                #{item}
-            </foreach>
-            AND del_flag = 0
-            AND enable_flag = 'enable'
-    </select>
-
     <!-- 根据UserId列表查询用户Id、头像、昵称，过滤掉被禁用的，包含未激活的-->
     <select id="selectEnableStaffMsg" resultType="com.epmet.dto.result.CommonStaffInfoResultDTO">
         SELECT

From 5a8c9f078a0bd1b84752745ba97b98ebaf47dc18 Mon Sep 17 00:00:00 2001
From: zxc <954985705@qq.com>
Date: Thu, 30 Apr 2020 15:00:10 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84gridId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CustomerGridServiceImpl.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 1cb5a09223..367ee133fa 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -227,9 +227,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             }
         }
         baseDao.insert(customerGridEntity);
-        //查询刚刚添加的gridId
-        AddGridResultDTO addGridResultDTO = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(), addGridFormDTO.getAgencyId(), null);
-        return new Result<AddGridResultDTO>().ok(addGridResultDTO);
+        AddGridResultDTO resultDTO = new AddGridResultDTO();
+        resultDTO.setGridId(customerGridEntity.getId());
+        return new Result<AddGridResultDTO>().ok(resultDTO);
     }
 
     /**

From 1035900c90e5b4afe79958b75d657ebf3f140b8c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 30 Apr 2020 15:19:15 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/gov-access/gov-access-server/docker-compose.yml | 2 +-
 epmet-module/gov-access/gov-access-server/pom.xml            | 2 +-
 epmet-module/gov-org/gov-org-server/docker-compose.yml       | 2 +-
 epmet-module/gov-org/gov-org-server/pom.xml                  | 2 +-
 epmet-module/resi-group/resi-group-server/docker-compose.yml | 2 +-
 epmet-module/resi-group/resi-group-server/pom.xml            | 2 +-
 epmet-user/epmet-user-server/docker-compose.yml              | 2 +-
 epmet-user/epmet-user-server/pom.xml                         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-access/gov-access-server/docker-compose.yml b/epmet-module/gov-access/gov-access-server/docker-compose.yml
index c0ee5d46af..4cfcd4676f 100644
--- a/epmet-module/gov-access/gov-access-server/docker-compose.yml
+++ b/epmet-module/gov-access/gov-access-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.6
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.7
     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 55bb36dfe0..69e8af3c03 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.6</version>
+    <version>0.3.7</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml
index 12b9650f11..5f1c7f3385 100644
--- a/epmet-module/gov-org/gov-org-server/docker-compose.yml
+++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.27
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.28
     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 82a7cfc712..2829929b7a 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.27</version>
+    <version>0.3.28</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>
diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml
index c012118682..ae9b3431ac 100644
--- a/epmet-module/resi-group/resi-group-server/docker-compose.yml
+++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.11
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.12
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 39f0317030..793c9e1c69 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-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.11</version>
+    <version>0.3.12</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>
diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml
index e704e32fb7..7cfd36ce0c 100644
--- a/epmet-user/epmet-user-server/docker-compose.yml
+++ b/epmet-user/epmet-user-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.20
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.21
     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 08c05bf0fd..43e9eba5ad 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.20</version>
+    <version>0.3.21</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

From 129ea08a9fa068876fdeea6bc54d2ef316a66869 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 30 Apr 2020 15:34:57 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=BB=BA=E7=BB=84?=
 =?UTF-8?q?=E6=97=B6=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AFbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/StaffRoleDao.xml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
index 6dcb9625d0..e458311c26 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
@@ -89,7 +89,7 @@
                     GOV_STAFF_ROLE
                 WHERE
                     ROLE_KEY IN
-                        <foreach item="roleKey" collection="rolekeys" open="(" separator="," close=")">
+                        <foreach item="roleKey" collection="roleKeys" open="(" separator="," close=")">
                         #{rolekey}
                         </foreach>
                     AND DEL_FLAG = '0' )

From 00005ce59ee58abd9e8fc8f2d10d66c672637999 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 30 Apr 2020 15:44:03 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/group/service/impl/ResiGroupServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 022eb30346..e8c98a1fd6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -829,9 +829,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				if(!result.success()){
 					logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,msg));
 				}
+				return;
 			}
 		}
-
+         logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,msg));
 
 	}
 }

From 11a0d32e30eb67d6b5cd4652fffece9e251986a4 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 30 Apr 2020 15:45:46 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/group/service/impl/ResiGroupServiceImpl.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index e8c98a1fd6..9282ee3895 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -826,10 +826,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 					msgList.add(msgObj);
 				}
 				Result result = epmetMessageFeignClient.saveUserMessageList(msgList);
-				if(!result.success()){
-					logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,msg));
+				if(result.success()){
+                    return;
 				}
-				return;
 			}
 		}
          logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,msg));

From 2a849dc6d41cb02c7e5c00247d9aac26ae0bcfbd Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 30 Apr 2020 16:22:26 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=B7=B2=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/partymember/PartymemberBaseInfoDao.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
index 2cbad32ae0..bb97987577 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
@@ -60,7 +60,7 @@
         SELECT
             pi.USER_ID AS userId,
             concat( pi.SURNAME, pi.NAME ) AS realName,
-            unix_timestamp(pi.CREATED_TIME) AS applyTime,
+            unix_timestamp(pi.CREATED_TIME)*1000 AS applyTime,
             pcm.READ_FLAG AS readFlag,
             pi.id as partyMemberId,
             pca.id as autoId,
@@ -85,7 +85,7 @@
         SELECT
             pi.USER_ID AS userId,
             concat( pi.SURNAME, pi.NAME ) AS realName,
-            unix_timestamp(pi.CREATED_TIME) AS applyTime,
+            unix_timestamp(pi.CREATED_TIME)*1000 AS applyTime,
             pi.CONFIRM_RESULT AS status,
             pi.id as partyMemberId,
             pca.id as autoId,
@@ -102,7 +102,7 @@
         SELECT
             pi.USER_ID AS userId,
             concat( pi.SURNAME, pi.NAME ) AS realName,
-            unix_timestamp(pi.CREATED_TIME) AS applyTime,
+            unix_timestamp(pi.CREATED_TIME)*1000 AS applyTime,
             pi.CONFIRM_RESULT AS status,
             pi.id as partyMemberId,
             pca.id as autoId,

From 5c70ef62ea3bbd905c0a45d9b603b448c94df8f1 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 30 Apr 2020 16:41:40 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=AF=9D=E9=A2=98=E5=88=97=E8=A1=A8=E5=92=8C=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD=E8=AF=9D=E9=A2=98=E5=88=97=E8=A1=A8=E5=B0=86=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=97=B6=E9=97=B4=E4=BB=8E=E6=97=B6=E9=97=B4=E6=88=B3?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA=E6=97=A5=E6=9C=9F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=B9=B6=E4=BD=BF=E7=94=A8@JsonFormat=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ResiTopicServiceImpl.java | 4 ++--
 .../dto/topic/result/GovHiddenTopicInfoResultDTO.java     | 7 +++++--
 .../group/dto/topic/result/GovTopicInfoResultDTO.java     | 8 ++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java
index 9d5318b595..23dbd83fe9 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java
@@ -47,7 +47,7 @@ public class ResiTopicServiceImpl implements ResiTopicService {
                 govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto());
                 govTopic.setUserNickName(top.getReleaseUserName());
                 govTopic.setTopicId(top.getTopicId());
-                govTopic.setTopicRealseTime(top.getReleaseTime().getTime());
+                govTopic.setTopicRealseTime(top.getReleaseTime());
                 govTopic.setTopicFirstPhoto(top.getFirstPhoto());
                 topicsResult.add(govTopic);
             });
@@ -76,7 +76,7 @@ public class ResiTopicServiceImpl implements ResiTopicService {
                 govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto());
                 govTopic.setUserNickName(top.getReleaseUserName());
                 govTopic.setTopicId(top.getTopicId());
-                govTopic.setTopicRealseTime(top.getReleaseTime().getTime());
+                govTopic.setTopicRealseTime(top.getReleaseTime());
                 govTopic.setTopicFirstPhoto(top.getFirstPhoto());
                 govTopic.setTopicState(top.getStatus());
                 topicsResult.add(govTopic);
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java
index ad5bcf4f61..6008f6c0eb 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java
@@ -1,8 +1,10 @@
 package com.epmet.resi.group.dto.topic.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description
@@ -40,9 +42,10 @@ public class GovHiddenTopicInfoResultDTO implements Serializable {
     private String topicContent;
 
     /**
-     * 话题发布时间 时间戳
+     * 话题发布时间
      * */
-    private Long topicRealseTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date topicRealseTime;
 
     /**
      * 话题的第一张图片地址
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java
index 296f4fcc36..d60a24382d 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java
@@ -1,8 +1,11 @@
 package com.epmet.resi.group.dto.topic.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
+
 
 /**
  * @Description
@@ -40,9 +43,10 @@ public class GovTopicInfoResultDTO implements Serializable {
     private String topicContent;
 
     /**
-     * 话题发布时间 时间戳
+     * 话题发布时间
      * */
-    private Long topicRealseTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date topicRealseTime;
 
     /**
      * 话题的第一张图片地址

From 2b5cba9897e9a8b5921cc6da5e5095f210abeb8d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 30 Apr 2020 16:44:24 +0800
Subject: [PATCH 12/12] =?UTF-8?q?topiccomments=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResiTopicCommentController.java           | 42 +++++++++++++++++++
 .../epmet/controller/ResiTopicController.java | 13 ------
 2 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicCommentController.java

diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicCommentController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicCommentController.java
new file mode 100644
index 0000000000..37ace59d99
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicCommentController.java
@@ -0,0 +1,42 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
+import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO;
+import com.epmet.service.ResiTopicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Description 话题评论相关接口
+ * @Author yinzuomei
+ * @Date 2020/4/30 16:42
+ */
+@RestController
+@RequestMapping("topic")
+public class ResiTopicCommentController {
+    @Autowired
+    private ResiTopicService resiTopicService;
+    /**
+     * @Description 政府端群组管理-获取某个话题的评论列表
+     * @Param tokenDto
+     * @Param ResiQueryCommentFormDTO
+     * @return Result<List<ResiCommentResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 23:49
+     **/
+    @PostMapping("topiccomments")
+    Result<List<GovCommentResultDTO>> topicComments(@LoginUser TokenDto tokenDto, @RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
+        ValidatorUtils.validateEntity(queryCommentFormDTO);
+        return resiTopicService.topicComments(queryCommentFormDTO);
+    }
+}
+
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java
index f821df15c9..6686e605f6 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java
@@ -70,19 +70,6 @@ public class ResiTopicController {
         return resiTopicService.topicDetail(topicDetailFormDTO);
     }
 
-    /**
-     * @Description 政府端群组管理-获取某个话题的评论列表
-     * @Param tokenDto
-     * @Param ResiQueryCommentFormDTO
-     * @return Result<List<ResiCommentResultDTO>>
-     * @Author wangc
-     * @Date 2020.04.01 23:49
-     **/
-    @PostMapping("topiccomments")
-    Result<List<GovCommentResultDTO>> topicComments(@LoginUser TokenDto tokenDto, @RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
-        ValidatorUtils.validateEntity(queryCommentFormDTO);
-        return resiTopicService.topicComments(queryCommentFormDTO);
-    }
 
 
 }