Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project

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);
+	}
 }

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.2
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.3
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络

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.2</version>
+    <version>0.3.3</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-job</artifactId>

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.17
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

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.17
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

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.17</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>

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 {
 

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.拿到所属组织机构信息
+        GovTokenDto userDetails = getUserDetails(loginUserUtil.getLoginUserApp(), loginUserUtil.getLoginUserClient(), loginUserUtil.getLoginUserId());
-        Result<CustomerAgencyDTO> agencyByStaffRst = govOrgFeignClient.getAgencyByStaff(staffId);
+        if (userDetails == null) {
-        if (!agencyByStaffRst.success()) {
+            throw new RenException(EpmetErrorCode.ERR10006.getCode(), EpmetErrorCode.ERR10006.getMsg());
-            logger.error("根据StaffId查询所属单位出错,StaffId:{}, 错误信息:{}", staffId, agencyByStaffRst.getMsg());
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         }
-        CustomerAgencyDTO belongAgency = agencyByStaffRst.getData();
+
-        if (belongAgency == null) {
+        // 1.拿到所属组织机构信息
-            logger.error("根据StaffId查询所属单位结果为空,StaffId:{}", staffId);
+        String belongAgencyId = getBelongAgencyFromOrgIdPath(userDetails.getOrgIdPath());
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        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(String.format("根据当前机构id[%s]查询pids失败:%s", currAgencyId, currAgencyRst.getMsg()));
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         }
 
-        // 查询机关单位中的角色
+        // 获取机关单位中的角色
-        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,26 @@ public class AccessServiceImpl implements AccessService {
 
         Set<String> filtedOps = new HashSet<>();
 
-        roleDTOS.forEach(roleDTO -> {
+        roleIdList.forEach(roleId -> {
-            List<RoleOpeScopeResultDTO> opeAndScopeDTO = listAllRoleOperationScopesByRoleId(roleDTO.getId());
+            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);
+    }
+
     /**
      * 获取当前所处机关与所属机关的关系
      */

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先生/女士
      *

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.26
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.29
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

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.28
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

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.26</version>
+    <version>0.3.29</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -678,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());
                 }

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.54
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

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.54
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

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.54</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

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 agency = agencyService.getAgencyById(agencyId);
-        CustomerAgencyDTO customerAgencyDTO = new CustomerAgencyDTO();
+        if (agency == null) {
-        if (agency != null) {
+            agency = new CustomerAgencyDTO();
-            BeanUtils.copyProperties(agency, customerAgencyDTO);
-            return new Result<CustomerAgencyDTO>().ok(customerAgencyDTO);
         }
-        return new Result<>();
+        return new Result<CustomerAgencyDTO>().ok(agency);
     }
 
     /**

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){
+    public CustomerAgencyDTO get(String agencyId){
-        return null;
+        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);
     }
 
 }

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);
 

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) {
+    public CustomerAgencyDTO getAgencyById(String agencyId) {
-        return customerAgencyDao.selectById(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

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.17
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.18
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

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.18
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

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.17</version>
+    <version>0.3.18</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

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.36
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.38
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

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.38
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

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.36</version>
+    <version>0.3.38</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

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.4
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.6
     ports:
       - "8104:8104"
     network_mode: host # 使用现有网络

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.5
     ports:
       - "8104:8104"
     network_mode: host # 使用现有网络

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.4</version>
+    <version>0.3.6</version>
 
     <parent>
         <artifactId>resi-home</artifactId>

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.18
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络

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.18</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>

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;
+
     /**
      * 
      */

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.43
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

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.42
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

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.43</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

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;
+
 }

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);
                 }
             }
 

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 = "";
+
+}

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>