diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
index 2bc1713d7e..32d4a07174 100644
--- a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
+++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-admin-server:
     container_name: epmet-admin-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.9
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.10
     ports:
       - "8082:8082"
     network_mode: host # 使用现有网络
diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
index 9e04bc6cb5..12d343d29c 100644
--- a/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
+++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-admin-server:
     container_name: epmet-admin-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-admin-server:0.3.9
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-admin-server:0.3.10
     ports:
       - "8082:8082"
     network_mode: host # 使用现有网络
diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml
index 7fc6ba29e5..d2da6877ad 100644
--- a/epmet-admin/epmet-admin-server/pom.xml
+++ b/epmet-admin/epmet-admin-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.9</version>
+    <version>0.3.10</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-admin</artifactId>
diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml
index c09782692c..00bcea3205 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.12
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.13
     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 7d50f4b735..e50004508f 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.12
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.13
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 036aeea2f0..6b35ed57bd 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.12</version>
+    <version>0.3.13</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index 1f449cf23c..321211465d 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -204,4 +204,13 @@ public class RedisKeys {
 	public static String getRoleAllOpeScopesKey(String roleId) {
 		return rootPrefix.concat("gov:access:role:allopescopes:").concat(roleId);
 	}
+
+	/**
+	 * 政府端机关单位缓存Key
+	 * @param agencyId
+	 * @return
+	 */
+	public static String getAgencyByIdKey(String agencyId) {
+		return rootPrefix.concat("gov:agency:").concat(agencyId);
+	}
 }
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index ccc3fa526d..1401594b88 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -108,8 +108,8 @@
                 <nacos.ip></nacos.ip>
                 <!-- gateway routes -->
                 <!--  1、认证服务  -->
-                <gateway.routes.epmet-auth-server.uri>http://localhost:8081</gateway.routes.epmet-auth-server.uri>
-<!--                <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>-->
+<!--                <gateway.routes.epmet-auth-server.uri>http://localhost:8081</gateway.routes.epmet-auth-server.uri>-->
+                <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>
                 <!--  2、Admin服务  -->
                 <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>
                 <!--  4、OSS服务 -->
diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
index 36820f68f4..b6e5e863e8 100644
--- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-job-server:
     container_name: epmet-job-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.3
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.4
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
index 8f4c3af631..cee525259a 100644
--- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-job-server:
     container_name: epmet-job-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.2
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.4
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml
index 920f3f9635..5418175cc2 100644
--- a/epmet-module/epmet-job/epmet-job-server/pom.xml
+++ b/epmet-module/epmet-job/epmet-job-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>epmet-job</artifactId>
diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
index 56bd1c5eab..64fe965914 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
@@ -3,7 +3,7 @@ services:
   epmet-oss-server:
     container_name: epmet-oss-server-dev
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.9
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.10
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
index 8a68457832..40284f9b3b 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml
+++ b/epmet-module/epmet-oss/epmet-oss-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.9</version>
+    <version>0.3.10</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-oss</artifactId>
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
index 2a51d935c8..13e962152b 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
@@ -136,4 +136,16 @@ public class OssController {
 	public Result<UploadImgResultDTO> uploadImg(@RequestParam("file") MultipartFile file) {
 		return ossService.uploadImg(file);
 	}
+
+	/**
+	 * 上传客户logo(考虑到以后可能会针对不同的业务有不同的限制条件，这里不再使用通用的接口
+	 * 针对每一个业务新建上传接口)
+	 * @param file
+	 * @return
+	 */
+	@PostMapping("customerlogo/upload")
+	public Result uploadCustomerLogo(@RequestParam("file") MultipartFile file) {
+		return ossService.uploadImg(file);
+	}
+
 }
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 c308abed16..b54894649e 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.14
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.20
     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 ad7d331577..c25ebfea7c 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.14
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.18
     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 57712195d0..d052c94726 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.14</version>
+    <version>0.3.20</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index d6ab4325af..c9f2e3eada 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
  * @Description
  * @Author sun
  */
-//, url = "localhost:8092"
+//@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class, url = "localhost:8092")
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
 public interface GovOrgFeignClient {
 
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 a56b4740fe..8c7e448f64 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
@@ -7,6 +7,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.GovTokenDto;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.OperationScopeConstant;
@@ -55,9 +56,13 @@ public class AccessServiceImpl implements AccessService {
     @Autowired
     private EpmetUserFeignClient userFeignClient;
 
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
     public static final String ORG_RELATION_SAME = "same";
     public static final String ORG_RELATION_SUB = "sub";
     public static final String ORG_RELATION_SUP = "sup";
+    public static final String ORG_PATH_SEPARATOR = ":";
 
     /**
      * 更新权限缓存
@@ -448,28 +453,42 @@ public class AccessServiceImpl implements AccessService {
     @Override
     public Set<String> listOperationPermissions(String staffId, String currAgencyId) {
 
-        // 1.拿到所属组织机构信息
-        Result<CustomerAgencyDTO> agencyByStaffRst = govOrgFeignClient.getAgencyByStaff(staffId);
-        if (!agencyByStaffRst.success()) {
-            logger.error("根据StaffId查询所属单位出错,StaffId:{}, 错误信息:{}", staffId, agencyByStaffRst.getMsg());
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        GovTokenDto userDetails = getUserDetails(loginUserUtil.getLoginUserApp(), loginUserUtil.getLoginUserClient(), loginUserUtil.getLoginUserId());
+        if (userDetails == null) {
+            throw new RenException(EpmetErrorCode.ERR10006.getCode(), EpmetErrorCode.ERR10006.getMsg());
         }
-        CustomerAgencyDTO belongAgency = agencyByStaffRst.getData();
-        if (belongAgency == null) {
-            logger.error("根据StaffId查询所属单位结果为空,StaffId:{}", staffId);
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+
+        // 1.拿到所属组织机构信息
+        String belongAgencyId = getBelongAgencyFromOrgIdPath(userDetails.getOrgIdPath());
+        Result<CustomerAgencyDTO> belongAgencyRst = govOrgFeignClient.getAgencyById(belongAgencyId);
+        if (!belongAgencyRst.success()) {
+            throw new RenException("查询用户的操作权限列表:调用GovOrg，根据belongAgencyId查询机构信息失败:".concat(belongAgencyRst.getInternalMsg()));
         }
 
+        CustomerAgencyDTO belongAgency = belongAgencyRst.getData();
+
+        //Result<CustomerAgencyDTO> agencyByStaffRst = govOrgFeignClient.getAgencyByStaff(staffId);
+        //if (!agencyByStaffRst.success()) {
+        //    logger.error("根据StaffId查询所属单位出错,StaffId:{}, 错误信息:{}", staffId, agencyByStaffRst.getMsg());
+        //    throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        //}
+        //CustomerAgencyDTO belongAgency = agencyByStaffRst.getData();
+        //if (belongAgency == null) {
+        //    logger.error("根据StaffId查询所属单位结果为空,StaffId:{}", staffId);
+        //    throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        //}
+
         // 2.拿到当前所处机关单位信息
         Result<CustomerAgencyDTO> currAgencyRst = govOrgFeignClient.getAgencyById(currAgencyId);
         CustomerAgencyDTO currAgencyDto = currAgencyRst.getData();
         if (!currAgencyRst.success() || currAgencyDto == null) {
-            logger.error("根据当前机构id[{}]查询pids失败:{}", currAgencyId, currAgencyRst.getMsg());
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            throw new RenException(String.format("根据当前机构id[%s]查询pids失败:%s", currAgencyId, currAgencyRst.getMsg()));
         }
 
-        // 查询机关单位中的角色
-        List<GovStaffRoleDTO> roleDTOS = queryGovStaffRoles(staffId, belongAgency.getId());
+        // 获取机关单位中的角色
+        // 目前一个人只在一个单位下，所以不动态查询，如果后面需要一个人在多个单位，再改这里
+        //List<GovStaffRoleDTO> roleDTOS = queryGovStaffRoles(staffId, belongAgency.getId());
+        Set<String> roleIdList = userDetails.getRoleIdList();
 
         // 当前组织和所属组织的orgId路径,以及他们的上下级关系
         String belongOrgIdPath = getOrgIdPath(belongAgency);
@@ -478,13 +497,27 @@ public class AccessServiceImpl implements AccessService {
 
         Set<String> filtedOps = new HashSet<>();
 
-        roleDTOS.forEach(roleDTO -> {
-            List<RoleOpeScopeResultDTO> opeAndScopeDTO = listAllRoleOperationScopesByRoleId(roleDTO.getId());
-            filtedOps.addAll(filterOpesByScope(currOrgRelation, opeAndScopeDTO));
-        });
+        if (!CollectionUtils.isEmpty(roleIdList)) {
+            roleIdList.forEach(roleId -> {
+                List<RoleOpeScopeResultDTO> opeAndScopeDTO = listAllRoleOperationScopesByRoleId(roleId);
+                filtedOps.addAll(filterOpesByScope(currOrgRelation, opeAndScopeDTO));
+            });
+        }
         return filtedOps;
     }
 
+    /**
+     * 从OrgIdPath中取所属机构(即最后一截)
+     * @param orgIdPath
+     * @return
+     */
+    private String getBelongAgencyFromOrgIdPath(String orgIdPath) {
+        if (!orgIdPath.contains(ORG_PATH_SEPARATOR)) {
+            return orgIdPath;
+        }
+        return orgIdPath.substring(orgIdPath.lastIndexOf(ORG_PATH_SEPARATOR) + 1);
+    }
+
     /**
      * 获取当前所处机关与所属机关的关系
      */
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 d3aad3f4c4..5166a597b5 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.23
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.24
     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 552bf1a18e..07d37a78f0 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.23
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.24
     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 cf2ba0e960..f9e946c2da 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.23</version>
+    <version>0.3.24</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-grid</artifactId>
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 13826f91e2..4a7efdb5ce 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
@@ -28,7 +28,7 @@ public class LatestIssueListResultDTO implements Serializable {
     /**
      * 用户头像
      */
-    private String staffHeadPhoto = "";
+    private String userHeadPhoto = "";
     /**
      * 议题发起人：XX路-XX先生/女士
      *
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 72f753f87e..b64fa5c355 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.27
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.30
     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 4380b18cc4..03e51d1ff5 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.26
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.30
     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 01723c912a..a32cb3c694 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.27</version>
+    <version>0.3.30</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
index db84562cb9..bedb47f25c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
@@ -13,8 +13,10 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueDTO;
 import com.epmet.dto.result.*;
 import com.epmet.excel.IssueExcel;
+import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import com.epmet.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -138,5 +140,16 @@ public class IssueController {
         return new Result<List<LatestIssueListResultDTO>>().ok(issueService.getNewestIssueList(formDTO));
     }
 
+    /**
+     * @Description  校验话题是否已转议题
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping(value = "checktopicshiftissue")
+    public Result<Integer> checkTopicShiftIssue(@RequestBody TopicInfoFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<Integer>().ok(issueService.checkTopicShiftIssue(formDTO));
+    }
+
 }
 
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 377c731120..9dee92932c 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
@@ -22,6 +22,7 @@ import com.epmet.dto.IssueDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IssueEntity;
+import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -136,4 +137,11 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @date 2020.05.22 00:36
     **/
     Set<IssueDTO> selectIssueIdsByCondition(IssueDTO issueDTO);
+
+    /**
+     * @Description  校验话题是否已转议题
+     * @param formDTO
+     * @author zxc
+     */
+    Integer checkTopicShiftIssue(TopicInfoFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
index 2d2860ce8a..d9f4417ec6 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
@@ -2,6 +2,7 @@ package com.epmet.service;
 
 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.IssueDTO;
 import com.epmet.dto.form.CloseIssueFormDTO;
 import com.epmet.dto.form.DepartmentStaffListFormDTO;
@@ -20,6 +21,7 @@ import com.epmet.dto.form.IssueDetailFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
 import com.epmet.entity.IssueEntity;
+import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -223,4 +225,11 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @date 2020.05.22 00:36
      **/
     Set<IssueDTO> getIssueIdsByCondition(IssueDTO issueDTO);
+
+    /**
+     * @Description  校验话题是否已转议题
+     * @param formDTO
+     * @author zxc
+     */
+    Integer checkTopicShiftIssue(TopicInfoFormDTO formDTO);
 }
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 b310d78e48..05129fc858 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
@@ -31,6 +31,7 @@ import com.epmet.feign.*;
 import com.epmet.redis.GovIssueRedis;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
+import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
 import com.epmet.service.IssueProcessService;
 import com.epmet.service.IssueProjectRelationService;
@@ -677,7 +678,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             resultDTO.setCreateIssueTime(issue.getCreatedTime().getTime()/1000);
             userInfoList.forEach(user -> {
                 if (issue.getCreatedBy().equals(user.getUserId())) {
-                    resultDTO.setStaffHeadPhoto(user.getHeadPhoto());
+                    resultDTO.setUserHeadPhoto(user.getHeadPhoto());
                     //话题发起人昵称
                     resultDTO.setIssuePublisherName(user.getShowName());
                 }
@@ -706,4 +707,14 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return baseDao.selectIssueIdsByCondition(issueDTO);
     }
 
+    /**
+     * @Description  校验话题是否已转议题
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    public Integer checkTopicShiftIssue(TopicInfoFormDTO formDTO) {
+        return baseDao.checkTopicShiftIssue(formDTO);
+    }
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
index e7b2475d59..aa229214b7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@@ -168,21 +168,24 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
      */
     @Override
     public VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId) {
+        //缓存获取议题表决详情
         VoteRedisFormDTO voteRedisFormDTO = issueVoteDetailRedis.get(issueId.getIssueId());
         VotingTrendResultDTO votingTrendResultDTO = new VotingTrendResultDTO();
         BeanUtils.copyProperties(voteRedisFormDTO, votingTrendResultDTO);
         votingTrendResultDTO.setRealityVoteCount(voteRedisFormDTO.getSupportAmount() + voteRedisFormDTO.getOppositionAmount());
+        //DB获取表决 日统计详情
         List<PolyLineDTO> polyLineDTOS = issueVoteStatisticalDao.polyLineData(issueId);
         PolyLineDTO polyLineDTO = new PolyLineDTO();
         polyLineDTO.setVoteDate(LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")));
+        //议题 已转项目 或 已结案 的时间
+        String date = issueDao.operateTime(issueId.getIssueId());
         //今天刚转项目或刚刚关闭，当天数据DB没有，直接从缓存拿
-        if (polyLineDTOS.size() == NumConstant.ZERO) {
+        if (polyLineDTOS.size() == NumConstant.ZERO && date.equals(LocalDate.now().toString())) {
             polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount());
             polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount());
             polyLineDTOS.add(polyLineDTO);
         } else {
-            //折线数据=DB
-            String date = issueDao.operateTime(issueId.getIssueId());
+            //折线数据=DB，今天之前转成的议题，今天 “已转项目”或“已结案”
             if (date.equals(LocalDate.now().toString())) {
                 Integer yesterdaySupport = 0;
                 Integer yesterdayOppose = 0;
@@ -195,6 +198,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
                 polyLineDTOS.add(polyLineDTO);
             }
         }
+        //今天之前 “已转项目”或“已关闭”
         votingTrendResultDTO.setPolyLine(polyLineDTOS);
         return votingTrendResultDTO;
     }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
index d78a370328..8f030f2237 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
@@ -366,4 +366,15 @@
         ISSUE_STATUS = #{issueStatus}
     </select>
 
+    <!-- 校验话题是否已转议题 -->
+    <select id="checkTopicShiftIssue" resultType="integer" parameterType="com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO">
+        SELECT
+            COUNT(*) AS issueCount
+        FROM
+            issue
+        WHERE
+            del_flag = 0
+            AND source_id = #{topicId}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
index b5f463b461..8b1f73139a 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.20
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.21
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
index 2779c18947..b769b4eb20 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.20
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.21
     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 2692a0c240..eaa31b17ea 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.20</version>
+    <version>0.3.21</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-mine</artifactId>
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 2654a1955d..993423120f 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.52
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.55
     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 d92fb192fe..25e7901f0e 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.52
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.55
     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 157ff219f3..6e1042ec07 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.52</version>
+    <version>0.3.55</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index a5c6f56580..a72f359ee2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -169,13 +169,11 @@ public class AgencyController {
      */
     @PostMapping("agencybyid/{agencyId}")
     public Result<CustomerAgencyDTO> getAgencyById(@PathVariable("agencyId") String agencyId) {
-        CustomerAgencyEntity agency = agencyService.getAgencyById(agencyId);
-        CustomerAgencyDTO customerAgencyDTO = new CustomerAgencyDTO();
-        if (agency != null) {
-            BeanUtils.copyProperties(agency, customerAgencyDTO);
-            return new Result<CustomerAgencyDTO>().ok(customerAgencyDTO);
+        CustomerAgencyDTO agency = agencyService.getAgencyById(agencyId);
+        if (agency == null) {
+            agency = new CustomerAgencyDTO();
         }
-        return new Result<>();
+        return new Result<CustomerAgencyDTO>().ok(agency);
     }
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java
index 3b8e96c9a2..0c2ed5e9aa 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java
@@ -17,9 +17,15 @@
 
 package com.epmet.redis;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.dto.CustomerAgencyDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Map;
 
 /**
  * 机关单位信息表
@@ -36,12 +42,19 @@ public class CustomerAgencyRedis {
 
     }
 
-    public void set(){
-
+    public void set(String agencyId, CustomerAgencyDTO value){
+        String key = RedisKeys.getAgencyByIdKey(agencyId);
+        Map<String, Object> map = BeanUtil.beanToMap(value, false, true);
+        redisUtils.hMSet(key, map);
     }
 
-    public String get(String id){
-        return null;
+    public CustomerAgencyDTO get(String agencyId){
+        String key = RedisKeys.getAgencyByIdKey(agencyId);
+        Map<String, Object> resultMap = redisUtils.hGetAll(key);
+        if (CollectionUtils.isEmpty(resultMap)) {
+            return null;
+        }
+        return BeanUtil.mapToBean(resultMap, CustomerAgencyDTO.class, true);
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
index a3cf56ec89..2f187a123d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
@@ -88,7 +88,7 @@ public interface AgencyService {
      * @param agencyId
      * @return
      */
-    CustomerAgencyEntity getAgencyById(String agencyId);
+    CustomerAgencyDTO getAgencyById(String agencyId);
 
     CustomerAgencyEntity getAgencyByStaff(String staffId);
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index 1393804624..5df63831c7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -28,11 +28,13 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
+import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.service.AgencyService;
 import com.epmet.service.CustomerAgencyService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +55,9 @@ public class AgencyServiceImpl implements AgencyService {
     @Autowired
     private CustomerAgencyService customerAgencyService;
 
+    @Autowired
+    private CustomerAgencyRedis customerAgencyRedis;
+
     /**
      * @param formDTO
      * @return
@@ -241,8 +246,17 @@ public class AgencyServiceImpl implements AgencyService {
     }
 
     @Override
-    public CustomerAgencyEntity getAgencyById(String agencyId) {
-        return customerAgencyDao.selectById(agencyId);
+    public CustomerAgencyDTO getAgencyById(String agencyId) {
+        CustomerAgencyDTO cachedAgency = customerAgencyRedis.get(agencyId);
+        if (cachedAgency == null) {
+            cachedAgency = new CustomerAgencyDTO();
+            CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(agencyId);
+            if (agencyEntity != null) {
+                BeanUtils.copyProperties(agencyEntity, cachedAgency);
+            }
+            customerAgencyRedis.set(agencyId, cachedAgency);
+        }
+        return cachedAgency;
     }
 
     @Override
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 91a669aae7..a96a67329e 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.18
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.19
     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 6c880afdcf..e66ed1ef82 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.17
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.19
     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 10028b03ff..a3f7770599 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.18</version>
+    <version>0.3.19</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
index 8fe0e2d5f4..ebeb87a063 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
@@ -34,7 +34,7 @@
     </select>
     <select id="selectProjectStaffInfo" resultType="com.epmet.dto.ProjectStaffDTO">
         SELECT ps.* FROM project_staff ps
-        INNER JOIN project_process pp ON ps.DEPARTMENT_NAME = pp.DEPARTMENT_NAME AND ps.STAFF_ID = pp.STAFF_ID
+        INNER JOIN project_process pp ON ps.DEPARTMENT_NAME = pp.DEPARTMENT_NAME AND ps.STAFF_ID = pp.STAFF_ID AND ps.PROJECT_ID = pp.PROJECT_ID
         WHERE ps.DEL_FLAG = '0'
             AND pp.DEL_FLAG = '0'
             AND pp.ID = #{processId}
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java
index bd9ba0afa3..7a78fbb209 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java
@@ -83,6 +83,11 @@ public class CustomerDTO implements Serializable {
      */
 	private String organizationLevel;
 
+    /**
+     * 客户logo
+     */
+	private String logo;
+
     /**
      * 删除标识：0.未删除 1.已删除
      */
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerFormDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerFormDTO.java
index daab4602dc..7cffb59d3f 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerFormDTO.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerFormDTO.java
@@ -39,5 +39,10 @@ public class CustomerFormDTO implements Serializable {
 
     @NotBlank(message = "客户ID", groups = {GetCustomerDetailGroup.class})
     private String customerId;
+
+    /**
+     * 客户LOGO
+     */
+    private String logo;
 }
 
diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java
index 666a45b69c..5b70f673ab 100644
--- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java
+++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java
@@ -37,4 +37,9 @@ public class ValidCustomerResultDTO implements Serializable {
 	 * 根级组织ID
 	 */
 	private String rootAgencyId;
+
+	/**
+	 * 客户logo
+	 */
+	private String logo;
 }
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 144e04daca..c7f483e012 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.14
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.16
     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 12c9d72b3f..a1b1085ab0 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.14
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.15
     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 fe955fa644..c3ddd2f12d 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.14</version>
+    <version>0.3.16</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
index 1caf84c054..70776b608b 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
@@ -177,7 +177,7 @@ public class CustomerController {
 	@PostMapping("add")
 	public Result<Map<String, String>> addCustomer(@RequestBody CustomerFormDTO form) {
 		ValidatorUtils.validateEntity(form, CustomerFormDTO.AddCustomerGroup.class);
-		String customerId = customerService.addCustomer(form.getCustomerName(), form.getOrganizationLevel());
+		String customerId = customerService.addCustomer(form.getCustomerName(), form.getOrganizationLevel(), form.getLogo());
 		Map<String, String> resultmap = new HashMap<>();
 		resultmap.put("customerId", customerId);
 		return new Result<Map<String, String>>().ok(resultmap);
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java
index 41ec253b2c..c5c511cbed 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java
@@ -83,4 +83,9 @@ public class CustomerEntity extends BaseEpmetEntity {
 	 */
 	private String organizationLevel;
 
+	/**
+	 * 客户logo
+	 */
+	private String logo;
+
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java
index 28b47d4af0..ad71749b9b 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java
@@ -137,9 +137,10 @@ public interface CustomerService extends BaseService<CustomerEntity> {
      * 新增客户
      * @param customerName
      * @param organizationLevel
+     * @param logo logo
      * @return
      */
-    String addCustomer(String customerName, String organizationLevel);
+    String addCustomer(String customerName, String organizationLevel, String logo);
 
     /**
      * 添加管理员
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
index 0d2371163a..9510e0631d 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@@ -147,7 +147,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
             validCustomers.stream().forEach(customer -> {
                 CustomerAgencyDTO rootAgency = rootAgencies.get(customer.getCustomerId());
                 customer.setHasRootAgency(rootAgency == null ? false : true);
-                customer.setRootAgencyId(rootAgency == null ? null : rootAgency.getId());
+                customer.setRootAgencyId(rootAgency == null ? "" : rootAgency.getId());
                 if (rootAgency != null) {
                     rootAgencyIds.add(rootAgency.getId());
                 }
@@ -160,7 +160,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
             //2.查询客户的根级组织对应的管理员角色列表，批量查询
             StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO();
             staffRoleFormDTO.setOrgIds(rootAgencyIds);
-            staffRoleFormDTO.setRoleKey("manager");// TODO ，此处应该将所有的角色key放到EpmetUser的client中
+            staffRoleFormDTO.setRoleKey(RoleKeyConstants.ROLE_KEY_MANAGER);// TODO ，此处应该将所有的角色key放到EpmetUser的client中
             Result<Map<String, List<GovStaffRoleResultDTO>>> managersResult = epmetUserFeignClient.getStaffsInRoleOfOrgs(staffRoleFormDTO);
             if (managersResult.success()) {
                 Map<String, List<GovStaffRoleResultDTO>> rootAgencyManagerMap = managersResult.getData();
@@ -207,7 +207,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
 
     @Override
     @Transactional
-    public String addCustomer(String customerName, String organizationLevel) {
+    public String addCustomer(String customerName, String organizationLevel, String logo) {
 
         // 校验
         CustomerDTO customerExists = baseDao.selectByCustomerName(customerName);
@@ -223,24 +223,25 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         customerEntity.setOrganizationImg("");
         customerEntity.setValidityTime(getValidityTime());
         customerEntity.setOrganizationLevel(organizationLevel);
+        customerEntity.setLogo(logo);
         int insert = baseDao.insert(customerEntity);
         if (insert == 0) {
             throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode());
         }
 
-        // 2. 给客户初始化角色列表
-        Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(customerEntity.getId());
-        if (!initResult.success()) {
-            throw new RenException("客户新增:为客户初始化角色调用user服务失败:".concat(initResult.toString()));
-        }
-
-        //3. 给客户初始化 定制化首页
-        CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
-        initHomeForm.setCustomerId(customerEntity.getId());
-        Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
-        if (!initHomeResult.success()) {
-            throw new RenException("初始化首页失败:".concat(initHomeResult.getInternalMsg()));
-        }
+        //// 2. 给客户初始化角色列表
+        //Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(customerEntity.getId());
+        //if (!initResult.success()) {
+        //    throw new RenException("客户新增:为客户初始化角色调用user服务失败:".concat(initResult.toString()));
+        //}
+        //
+        ////3. 给客户初始化 定制化首页
+        //CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
+        //initHomeForm.setCustomerId(customerEntity.getId());
+        //Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
+        //if (!initHomeResult.success()) {
+        //    throw new RenException("初始化首页失败:".concat(initHomeResult.getInternalMsg()));
+        //}
 
         return customerEntity.getId();
     }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
index 6f16fec155..8ed4314464 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
@@ -13,6 +13,7 @@
         <result property="customerAdmin" column="CUSTOMER_ADMIN"/>
         <result property="customerPassword" column="CUSTOMER_PASSWORD"/>
         <result property="organizationLevel" column="ORGANIZATION_LEVEL"/>
+        <result property="logo" column="LOGO"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -23,9 +24,9 @@
 
     <!--   运营端-获取有效客户列表 (未删除+有效期内的，按照客户名称排序 )-->
     <select id="selectListValidCustomerResultDTO" resultType="com.epmet.dto.result.ValidCustomerResultDTO">
-        SELECT
-            c.id AS CUSTOMER_ID,
-            c.CUSTOMER_NAME
+        SELECT c.id AS CUSTOMER_ID,
+               c.CUSTOMER_NAME,
+               CASE WHEN c.LOGO IS NULL THEN '' ELSE c.LOGO END AS LOGO
         FROM
             customer c
         WHERE
diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
index 628e99637f..562db00319 100644
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.13
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.14
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
index 9c941df467..db34367489 100644
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.13
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.14
     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 4c9f396378..72fb466057 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.13</version>
+    <version>0.3.14</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>
diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
index 17bfed279e..81bafbc322 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.37
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.39
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
index 90a785fe5f..6fd9ba00aa 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.36
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.39
     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 98a4fd290c..2adabd6522 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.37</version>
+    <version>0.3.39</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovIssueFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovIssueFeignClient.java
index d9f7c146b1..1b9622fb8e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovIssueFeignClient.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovIssueFeignClient.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
 import com.epmet.modules.feign.fallback.GovIssueFeignClientFallBack;
+import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,4 +27,12 @@ public interface GovIssueFeignClient {
     **/
     @PostMapping(value = "gov/issue/issue/topicshiftissue", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<String> issueShiftedToTopic(IssueShiftedFromTopicFormDTO issueShiftedFromTopicFormDTO);
+
+    /**
+     * @Description  校验话题是否已转议题
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping(value = "gov/issue/issue/checktopicshiftissue", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<Integer> checkTopicShiftIssue(TopicInfoFormDTO formDTO);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovIssueFeignClientFallBack.java
index b3cc109467..d518647f76 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovIssueFeignClientFallBack.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovIssueFeignClientFallBack.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
 import com.epmet.modules.feign.GovIssueFeignClient;
+import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import org.springframework.stereotype.Component;
 
 /**
@@ -20,4 +21,9 @@ public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
     public Result<String> issueShiftedToTopic(IssueShiftedFromTopicFormDTO issueShiftedFromTopicFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueShiftedToTopic", issueShiftedFromTopicFormDTO);
     }
+
+    @Override
+    public Result<Integer> checkTopicShiftIssue(TopicInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "checkTopicShiftIssue", formDTO);
+    }
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index d60d161e6b..9c6ecbc007 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -1025,67 +1025,72 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         Date now = new Date();
         //2.调用gov-org获取数据权限
         ResiTopicAndGroupResultDTO group = baseDao.getGroupInfoByTopicId(topicTurnIssueFromDTO.getTopicId());
-        if(null != group){
-            CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
-            dataFilterParam.setUserId(topicTurnIssueFromDTO.getUserId());
-            dataFilterParam.setGridId(group.getGridId());
-            Result<CommonDataFilterResultDTO> dataFilterResult =
-                    govOrgFeignClient.gridDataFilter(dataFilterParam);
-            if(dataFilterResult.success() && null != dataFilterResult.getData()){
-                IssueShiftedFromTopicFormDTO issueInfo = ConvertUtils.sourceToTarget(topicTurnIssueFromDTO,IssueShiftedFromTopicFormDTO.class);
-                issueInfo.setCreatedTime(now);
-                issueInfo.setGridId(group.getGridId());
-                issueInfo.setCustomerId(group.getCustomerId());
-                issueInfo.setOrgId(dataFilterResult.getData().getAgencyId());
-                issueInfo.setOrgIdPath(dataFilterResult.getData().getOrgIdPath());
-                issueInfo.setOrgName(dataFilterResult.getData().getOrgName());
-                //3.获取小组名称、话题作者、议题发起人
-                ResiGroupMemberInfoRedisDTO topicAuthor =  resiGroupMemberRedis.get(group.getGroupId(), group.getTopicAuthorId());
-                issueInfo.setTopicAuthor(null == topicAuthor ? ModuleConstant.EMPTY_STR : topicAuthor.getUserShowName());
-                ResiGroupMemberInfoRedisDTO issueAuthor = resiGroupMemberRedis.get(group.getGroupId(),topicTurnIssueFromDTO.getUserId());
-                issueInfo.setIssueAuthor(null == issueAuthor ? ModuleConstant.EMPTY_STR : issueAuthor.getUserShowName());
-                ResiGroupInfoRedisDTO groupCache = resiGroupRedis.get(group.getGroupId());
-                issueInfo.setGroupName(null == groupCache ? ModuleConstant.EMPTY_STR : groupCache.getGroupName());
-                issueInfo.setVotableCount(resiGroupMemberService.gridResiCount(group.getGridId()));
-                //4.调用gov-issue新增议题
-                Result<String> issueResult = govIssueFeignClient.issueShiftedToTopic(issueInfo);
-                //5.修改话题shiftIssue字段
-                if(issueResult.success() && StringUtils.isNotBlank(issueResult.getData())){
-                    ResiTopicEntity topic2Upd = new ResiTopicEntity();
-                    topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
-                    topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
-                    topic2Upd.setShiftIssue(Boolean.TRUE);
-                    topic2Upd.setIssueId(issueResult.getData());
-                    topic2Upd.setUpdatedTime(now);
-                    int topicResult = baseDao.updateOne(topic2Upd);
-                    //6.新增话题操作记录
-                    if(topicResult == NumConstant.ONE) {
-                        ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
-                        operation.setCreatedTime(now);
-                        operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
-                        operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
-                        operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
-                        int operationResult = resiTopicOperationDao.insertOneByParams(operation);
-                        if(operationResult != NumConstant.ONE){
-                            logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
-                        }
-                    }
-                    //7.更新组统计信息 议题数量+1
-                    resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
-                    if(null != groupCache && null != groupCache.getGroupStatisticalInfo()){
-                        groupCache.getGroupStatisticalInfo().setTotalIssues(
-                                null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE
-                                        : groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE
-                        );
-                        resiGroupRedis.set(groupCache);
+        if(null == group) {
+            throw new RenException(ModuleConstant.FAILURE_TO_TURN_ISSUE);
+        }
+        TopicInfoFormDTO topicId = new TopicInfoFormDTO();
+        topicId.setTopicId(topicTurnIssueFromDTO.getTopicId());
+        Integer issueCount = govIssueFeignClient.checkTopicShiftIssue(topicId).getData();
+        if (issueCount != NumConstant.ZERO){
+            throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
+        }
+        CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
+        dataFilterParam.setUserId(topicTurnIssueFromDTO.getUserId());
+        dataFilterParam.setGridId(group.getGridId());
+        Result<CommonDataFilterResultDTO> dataFilterResult =
+                govOrgFeignClient.gridDataFilter(dataFilterParam);
+        if(dataFilterResult.success() && null != dataFilterResult.getData()){
+            IssueShiftedFromTopicFormDTO issueInfo = ConvertUtils.sourceToTarget(topicTurnIssueFromDTO,IssueShiftedFromTopicFormDTO.class);
+            issueInfo.setCreatedTime(now);
+            issueInfo.setGridId(group.getGridId());
+            issueInfo.setCustomerId(group.getCustomerId());
+            issueInfo.setOrgId(dataFilterResult.getData().getAgencyId());
+            issueInfo.setOrgIdPath(dataFilterResult.getData().getOrgIdPath());
+            issueInfo.setOrgName(dataFilterResult.getData().getOrgName());
+            //3.获取小组名称、话题作者、议题发起人
+            ResiGroupMemberInfoRedisDTO topicAuthor =  resiGroupMemberRedis.get(group.getGroupId(), group.getTopicAuthorId());
+            issueInfo.setTopicAuthor(null == topicAuthor ? ModuleConstant.EMPTY_STR : topicAuthor.getUserShowName());
+            ResiGroupMemberInfoRedisDTO issueAuthor = resiGroupMemberRedis.get(group.getGroupId(),topicTurnIssueFromDTO.getUserId());
+            issueInfo.setIssueAuthor(null == issueAuthor ? ModuleConstant.EMPTY_STR : issueAuthor.getUserShowName());
+            ResiGroupInfoRedisDTO groupCache = resiGroupRedis.get(group.getGroupId());
+            issueInfo.setGroupName(null == groupCache ? ModuleConstant.EMPTY_STR : groupCache.getGroupName());
+            issueInfo.setVotableCount(resiGroupMemberService.gridResiCount(group.getGridId()));
+            //4.调用gov-issue新增议题
+            Result<String> issueResult = govIssueFeignClient.issueShiftedToTopic(issueInfo);
+            //5.修改话题shiftIssue字段
+            if(issueResult.success() && StringUtils.isNotBlank(issueResult.getData())){
+                ResiTopicEntity topic2Upd = new ResiTopicEntity();
+                topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
+                topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
+                topic2Upd.setShiftIssue(Boolean.TRUE);
+                topic2Upd.setIssueId(issueResult.getData());
+                topic2Upd.setUpdatedTime(now);
+                int topicResult = baseDao.updateOne(topic2Upd);
+                //6.新增话题操作记录
+                if(topicResult == NumConstant.ONE) {
+                    ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
+                    operation.setCreatedTime(now);
+                    operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
+                    operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
+                    operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
+                    int operationResult = resiTopicOperationDao.insertOneByParams(operation);
+                    if(operationResult != NumConstant.ONE){
+                        logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
                     }
-                    logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
-
                 }
+                //7.更新组统计信息 议题数量+1
+                resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
+                if(null != groupCache && null != groupCache.getGroupStatisticalInfo()){
+                    groupCache.getGroupStatisticalInfo().setTotalIssues(
+                            null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE
+                                    : groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE
+                    );
+                    resiGroupRedis.set(groupCache);
+                }
+                logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
+
             }
-            return;
         }
-        throw new RenException(ModuleConstant.FAILURE_TO_TURN_ISSUE);
     }
 
     /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index e152122a75..f077980f7f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -311,4 +311,6 @@ public interface ModuleConstant extends Constant {
 	 * 组状态 审核中
 	 * */
 	String GROUP_STATUS_UNDER_AUDITTING = "under_auditting";
+
+	String ALREADY_SHIFT_ISSUE = "话题已转议题，请勿重复操作";
 }
diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
index c8b075d49a..c1f673cb5d 100644
--- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-guide-server:
     container_name: resi-guide-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.9
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.10
     ports:
       - "8091:8091"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
index fe9c38c958..2e73303b83 100644
--- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-guide-server:
     container_name: resi-guide-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.9
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.10
     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 7eb2db30cc..7068529169 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.9</version>
+    <version>0.3.10</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-guide</artifactId>
diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
index 7235c60447..c540a76b9e 100644
--- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-hall-server:
     container_name: resi-hall-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.12
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.13
     ports:
       - "8100:8100"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
index c66242219a..a7ae918655 100644
--- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-hall-server:
     container_name: resi-hall-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.12
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.13
     ports:
       - "8100:8100"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml
index 307f97b547..3e504c7684 100644
--- a/epmet-module/resi-hall/resi-hall-server/pom.xml
+++ b/epmet-module/resi-hall/resi-hall-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.12</version>
+    <version>0.3.13</version>
     <parent>
         <artifactId>resi-hall</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
index c1efe4046a..7a3a0d06f2 100644
--- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-home-server:
     container_name: resi-home-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.5
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.7
     ports:
       - "8104:8104"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
index 53d4fd2827..ac1d21801a 100644
--- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-home-server:
     container_name: resi-home-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.4
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.7
     ports:
       - "8104:8104"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml
index 71c700a5d3..fae9f81571 100644
--- a/epmet-module/resi-home/resi-home-server/pom.xml
+++ b/epmet-module/resi-home/resi-home-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.5</version>
+    <version>0.3.7</version>
 
     <parent>
         <artifactId>resi-home</artifactId>
diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
index 75fd0c7d78..30343a7c08 100644
--- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.16
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.19
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
index 69c3cb5e37..a621ec68a6 100644
--- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.16
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.19
     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 54766af702..c55bd8f46c 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.16</version>
+    <version>0.3.19</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
index 339278ec7a..0b050efb75 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.34
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.35
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
index 4e269eb8f4..c663153f9c 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.34
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.35
     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 0357e5fb18..1ccfb66545 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.34</version>
+    <version>0.3.35</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java
index 5427012aba..fa17be450f 100755
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java
@@ -53,6 +53,11 @@ public class GovStaffRoleTemplateDTO implements Serializable {
      */
 	private String orgType;
 
+    /**
+     * 是否只有全职
+     * */
+    private Boolean fullTimeOnly;
+
     /**
      * 
      */
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 b866c80f11..cdefcbb31a 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.40
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.44
     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 ed7310d3a8..446f743e8d 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.40
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.44
     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 cbbdab7b2e..73354469b4 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.40</version>
+    <version>0.3.44</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java
index 7e843810dc..34a4844ad9 100755
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java
@@ -53,4 +53,9 @@ public class GovStaffRoleTemplateEntity extends BaseEpmetEntity {
      */
 	private String orgType;
 
+	/**
+	 * 是否只有全职
+	 * */
+	private Boolean fullTimeOnly;
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
index c23afa09a6..43fec48b74 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
@@ -16,15 +16,16 @@ import com.epmet.entity.UserEntity;
 import com.epmet.entity.UserWechatEntity;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.UserService;
+import com.epmet.util.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+
 import java.util.Date;
-import java.util.List;
+
 
 
 /**
@@ -153,12 +154,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             if(StringUtils.isNotBlank(myselfMsg.getGridId())){
                 //registerGridName 首次注册的网格
                 CustomerGridFormDTO gridId = new CustomerGridFormDTO();
-                gridId.setGridId(myselfMsg.getGridId());
+                gridId.setGridId(myResiUserInfoFormDTO.getGridId());
                 Result<CustomerGridDTO> gridResult = govOrgFeignClient.getCustomerGridByGridId(gridId);
                 if(gridResult.success() && null != gridResult.getData()){
                     result.setRegisterGridName(gridResult.getData().getGridName());
                 }else{
                     if(StringUtils.isNotBlank(gridResult.getMsg())) log.warn(gridResult.getMsg());
+                    result.setRegisterGridName(ModuleConstant.EMPTY_STR);
                 }
             }
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/ModuleConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/ModuleConstant.java
new file mode 100644
index 0000000000..4887b0a2f2
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/ModuleConstant.java
@@ -0,0 +1,13 @@
+package com.epmet.util;
+
+/**
+ * 常量类
+ * */
+public interface ModuleConstant {
+
+    /**
+     * 空字符串
+     * */
+     String EMPTY_STR = "";
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
index 4cd4ff5b2b..5788da7ba8 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
@@ -38,7 +38,6 @@
         where
             DEL_FLAG = '0'
         AND CUSTOMER_ID = #{customerId}
-        AND ORG_TYPE = 'agency'
         ORDER BY SORT ASC
     </select>