diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java
index 38963e991..006e25fb6 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java
@@ -38,54 +38,60 @@ public class ApiAdminController {
     public Result<String> getCompleteDeptName(Long gridId) {
         return adminService.getCompleteDeptName(gridId);
     }
+
     @GetMapping("/dept/getComplete")
     public Result<CompleteDeptDTO> getComplete(Long gridId) {
         return adminService.getComplete(gridId);
     }
 
     /**
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 获取小程序菜单
      * @author wgf
      * @date 2022/3/7 9:44
-     * @param dto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @PostMapping("getAppMenu")
     public Result getAppMenu(@LoginUser TokenDto userDetail, @RequestBody AppUserIdMenuDTO dto) {
-        return adminService.getAppMenu(userDetail,dto);
+        return adminService.getAppMenu(userDetail, dto);
     }
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 行程上报获取省/市/区/街道/社区信息，通过pid
      * @author wangtong
      * @date 2021/10/14 9:35
      * @params [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @GetMapping("/city/getAreaInfo")
-    public Result getAreaInfo(CityAreaFormDTO formDto){
+    public Result getAreaInfo(CityAreaFormDTO formDto) {
         return adminService.getAreaInfo(formDto);
     }
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
      * @describe: 获取所有部门的树状列表 街道-社区-网格
      * @author wangtong
      * @date 2022/8/29 11:01
      * @params [gridId]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
      */
     @GetMapping("dept/getAllDeptTree")
     public Result<List<SysDeptResultDTO>> getAllDeptTree() {
         return adminService.getAllDeptTree();
     }
 
+    @GetMapping("dept/party/getDeptTree")
+    public Result<DeptOption> getDeptTree() {
+        return adminService.getDeptTree();
+    }
+
     /**
-    * @describe: 通过经纬度获取社区及街道id
-    * @author wangtong
-    * @date 2022/8/31 11:19
-    * @params [dto]
-    * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptItudeResultDTO>
-    */
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptItudeResultDTO>
+     * @describe: 通过经纬度获取社区及街道id
+     * @author wangtong
+     * @date 2022/8/31 11:19
+     * @params [dto]
+     */
     @GetMapping("dept/getDeptIdByItude")
     public Result<DeptItudeResultDTO> getDeptIdByItude(DeptItudeFormDTO dto) {
         ValidatorUtils.validateEntity(dto);
@@ -110,7 +116,7 @@ public class ApiAdminController {
      * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
      *
      * @param dictType 数据字典类型
-     * @return com.elink.esua.commons.tools.utils.Result<java.util.List   <   com.elink.esua.dto.SysSimpleDictDTO>>
+     * @return com.elink.esua.commons.tools.utils.Result<java.util.List < com.elink.esua.dto.SysSimpleDictDTO>>
      * @author yujintao
      * @date 2019/7/15 09:33
      */
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java
index e25d9ff68..c16db7051 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java
@@ -11,6 +11,7 @@ import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
 import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.consult.form.GridForceListFormDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO;
 import com.elink.esua.epdc.service.CustomService;
@@ -148,7 +149,7 @@ public class ApiCustomController {
      *
      * @param formDTO
      * @param userDetail
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>>
      * @Author zhangyong
      * @Date 15:58 2021-09-14
      **/
@@ -159,6 +160,7 @@ public class ApiCustomController {
 
     /**
      * 建议详情
+     *
      * @param id
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>
      * @Author zhangyong
@@ -170,35 +172,35 @@ public class ApiCustomController {
     }
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 行程上报
      * @author wangtong
      * @date 2021/10/13 10:50
      * @params [userDetail, formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @PostMapping("saveTripInfo")
     public Result saveTripInfo(@LoginUser TokenDto userDetail, @RequestBody SaveTripInfoFormDTO formDto) {
-        return customService.saveTripInfo(userDetail,formDto);
+        return customService.saveTripInfo(userDetail, formDto);
     }
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 我的上报列表
      * @author wangtong
      * @date 2021/10/13 13:37
      * @params [userDetail, formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @GetMapping("getTripInfoList")
     public Result getTripInfoList(@LoginUser TokenDto userDetail, GetTripInfoFormDTO formDto) {
-        return customService.getTripInfoList(userDetail,formDto);
+        return customService.getTripInfoList(userDetail, formDto);
     }
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 上报详情
      * @author wangtong
      * @date 2021/10/13 13:37
      * @params [userDetail, formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @GetMapping("getTripInfoDetail")
     public Result getTripInfoDetail(GetTripInfoFormDTO formDto) {
@@ -206,14 +208,24 @@ public class ApiCustomController {
     }
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 删除上报信息
      * @author wangtong
      * @date 2021/10/13 14:17
      * @params [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @DeleteMapping("deleteTripById")
     public Result deleteTripById(@RequestBody GetTripInfoFormDTO formDto) {
         return customService.deleteTripById(formDto);
     }
+
+    /**
+     * 网格力量
+     * @param formDto
+     * @return
+     */
+    @PostMapping("listGridForce")
+    public Result listGridForce(@RequestBody GridForceListFormDTO formDto) {
+        return customService.listGridForce(formDto);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
index 92b58fcdf..d6d951ff9 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
@@ -26,8 +26,8 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/7 9:27
  */
-@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
-// @FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class,url = "http://127.0.0.1:9092")
+//@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class, url = "http://127.0.0.1:9092")
+ @FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
 public interface AdminFeignClient {
 
     /**
@@ -175,22 +175,25 @@ public interface AdminFeignClient {
     Result getAreaInfo(CityAreaFormDTO formDto);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
      * @describe: 获取所有部门的树状列表 街道-社区-网格
      * @author wangtong
      * @date 2022/8/29 11:01
      * @params [gridId]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
      */
     @GetMapping(value = "sys/dept/getAllDeptTree", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<SysDeptResultDTO>> getAllDeptTree();
 
+    @GetMapping(value = "sys/dept/party/getDeptTree", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<DeptOption> getDeptTree();
+
     /**
-    * @describe: 通过经纬度获取社区及街道id
-    * @author wangtong
-    * @date 2022/8/31 13:39
-    * @params [dto]
-    * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptItudeResultDTO>
-    */
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptItudeResultDTO>
+     * @describe: 通过经纬度获取社区及街道id
+     * @author wangtong
+     * @date 2022/8/31 13:39
+     * @params [dto]
+     */
     @GetMapping(value = "sys/dept/getDeptIdByItude", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<DeptItudeResultDTO> getDeptIdByItude(DeptItudeFormDTO dto);
 
@@ -207,4 +210,5 @@ public interface AdminFeignClient {
 
     @GetMapping("sys/appsys/listSimple/{dictType}")
     Result<List<SysSimpleDictDTO>> listSimpleDictInfo(@PathVariable("dictType") String dictType);
+
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java
index 9549aefbb..6165b2cdc 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java
@@ -9,6 +9,7 @@ import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
 import com.elink.esua.epdc.dto.EpidemicSentryPostDTO;
+import com.elink.esua.epdc.dto.consult.form.GridForceListFormDTO;
 import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
 import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO;
 import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
@@ -105,7 +106,7 @@ public interface CustomFeignClient {
     /***
      * 获取网格内网格员公示信息
      * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO>>
      * @author qushutong
      * @date 2020/3/3 11:26
      */
@@ -172,7 +173,7 @@ public interface CustomFeignClient {
      * 我提出的建议
      *
      * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>>
      * @Author zhangyong
      * @Date 15:59 2021-09-14
      **/
@@ -181,6 +182,7 @@ public interface CustomFeignClient {
 
     /**
      * 建议详情
+     *
      * @param id
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>
      * @Author zhangyong
@@ -190,42 +192,50 @@ public interface CustomFeignClient {
     Result<MySuggestionResultDTO> getDetailSuggestion(@PathVariable("id") String id);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 行程上报
      * @author wangtong
      * @date 2021/10/13 10:50
      * @params [userDetail, formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @PostMapping(value = "custom/tripreport/saveTripInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result saveTripInfo(SaveTripInfoFormDTO formDto);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 我的上报列表
      * @author wangtong
      * @date 2021/10/13 13:37
      * @params [userDetail, formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @GetMapping(value = "custom/tripreport/getTripInfoList", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result getTripInfoList(GetTripInfoFormDTO formDto);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 上报详情
      * @author wangtong
      * @date 2021/10/13 13:37
      * @params [userDetail, formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @GetMapping(value = "custom/tripreport/getTripInfoDetail", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result getTripInfoDetail(GetTripInfoFormDTO formDto);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 删除上报信息
      * @author wangtong
      * @date 2021/10/13 14:17
      * @params [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @DeleteMapping(value = "custom/tripreport/deleteTripById", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result deleteTripById(GetTripInfoFormDTO formDto);
+
+    /**
+     * 获取网格力量
+     * @param formDto
+     * @return
+     */
+    @PostMapping(value = "custom/gridForceinfo/listGridForce", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result listGridForce(GridForceListFormDTO formDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
index d7049eab6..927db1268 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
@@ -97,6 +97,11 @@ public class AdminFeignClientFallback implements AdminFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAllDeptTree");
     }
 
+    @Override
+    public Result<DeptOption> getDeptTree() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTree");
+    }
+
     @Override
     public Result<DeptItudeResultDTO> getDeptIdByItude(DeptItudeFormDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptIdByItude",dto);
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java
index d54261ca5..79da14565 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java
@@ -10,8 +10,9 @@ import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
 import com.elink.esua.epdc.dto.EpidemicSentryPostDTO;
-import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO;
+import com.elink.esua.epdc.dto.consult.form.GridForceListFormDTO;
 import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO;
 import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
 import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
@@ -124,4 +125,9 @@ public class CustomFeignClientFallback implements CustomFeignClient {
     public Result deleteTripById(GetTripInfoFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "deleteTripById", formDto);
     }
+
+    @Override
+    public Result listGridForce(GridForceListFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "listGridForce", formDto);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
index 09f4e7415..59260e759 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
@@ -90,4 +90,6 @@ public interface AdminService {
      * @date 2019/7/15 09:33
      */
     Result<List<SysSimpleDictDTO>> listSimpleDictInfo(String dictType);
+
+    Result<DeptOption> getDeptTree();
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java
index 65875f083..c5555dd2b 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java
@@ -9,6 +9,7 @@ import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
 import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.consult.form.GridForceListFormDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO;
 import com.elink.esua.epdc.user.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
@@ -39,12 +40,14 @@ public interface CustomService {
      **/
     Result report(EpiDemicReportFormDTO formDTO);
 
-    /**  根据小程序码内的字符串，解析机构名称和第三方哨卡id
+    /**
+     * 根据小程序码内的字符串，解析机构名称和第三方哨卡id
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO>
      * @Description
      * @Author songyunpeng
-     * @Date  2020/2/14
+     * @Date 2020/2/14
      * @Param [maCode]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO>
      **/
     Result<EpdcSentryPostInfoResultDTO> getDeptInfoByMaCode(String maCode);
 
@@ -93,9 +96,10 @@ public interface CustomService {
 
     /**
      * 我提出的建议
+     *
      * @param formDTO
      * @param userDetail
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>>
      * @Author zhangyong
      * @Date 15:58 2021-09-14
      **/
@@ -103,6 +107,7 @@ public interface CustomService {
 
     /**
      * 建议详情
+     *
      * @param id
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>
      * @Author zhangyong
@@ -111,38 +116,45 @@ public interface CustomService {
     Result<MySuggestionResultDTO> getDetailSuggestion(String id);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 行程上报
      * @author wangtong
      * @date 2021/10/13 10:50
      * @params [userDetail, formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result saveTripInfo(TokenDto userDetail, SaveTripInfoFormDTO formDto);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 我的上报列表
      * @author wangtong
      * @date 2021/10/13 13:37
      * @params [userDetail, formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result getTripInfoList(TokenDto userDetail, GetTripInfoFormDTO formDto);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 上报详情
      * @author wangtong
      * @date 2021/10/13 13:37
      * @params [userDetail, formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result getTripInfoDetail(GetTripInfoFormDTO formDto);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 删除上报信息
      * @author wangtong
      * @date 2021/10/13 14:17
      * @params [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result deleteTripById(GetTripInfoFormDTO formDto);
+
+    /**
+     * 网格力量
+     * @param formDto
+     * @return
+     */
+    Result listGridForce(GridForceListFormDTO formDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
index e2acf1f73..d09b528c4 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
@@ -64,6 +64,11 @@ public class AdminServiceImpl implements AdminService {
         return adminFeignClient.getAllDeptTree();
     }
 
+    @Override
+    public Result<DeptOption> getDeptTree() {
+        return adminFeignClient.getDeptTree();
+    }
+
     @Override
     public Result<DeptItudeResultDTO> getDeptIdByItude(DeptItudeFormDTO dto) {
         return adminFeignClient.getDeptIdByItude(dto);
@@ -78,4 +83,6 @@ public class AdminServiceImpl implements AdminService {
     public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(String dictType) {
         return adminFeignClient.listSimpleDictInfo(dictType);
     }
+
+
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index fabbac3af..1687dbb5f 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -268,7 +268,9 @@ public class AppUserServiceImpl implements AppUserService {
             return new Result().ok(authorization);
         }
         TokenDto tokenDto = ConvertUtils.sourceToTarget(userDto, TokenDto.class);
-
+        if (null != userDto.getCouplingCommunity()) {
+            tokenDto.setCouplingCommunity(userDto.getCouplingCommunity().split(","));
+        }
         String state = userDto.getState();
 
         authorization = this.packageEpdcAppAuthorization(tokenDto, userDto.getGrid(), state);
@@ -434,9 +436,10 @@ public class AppUserServiceImpl implements AppUserService {
 
     /**
      * 党建小程序必要参数校验
+     *
      * @param formDto
      */
-    private void commonVerifyUserRegisterData(EpdcUserRegistFormDTO formDto){
+    private void commonVerifyUserRegisterData(EpdcUserRegistFormDTO formDto) {
         // 校验身份证号码格式
         String verification = IdentityNoUtils.IdentityNoVerification(formDto.getIdentityNo());
         if (StringUtils.isNotBlank(verification)) {
@@ -535,7 +538,7 @@ public class AppUserServiceImpl implements AppUserService {
         user.setSex(IdentityNoUtils.getSex(formDto.getIdentityNo()));
         user.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(formDto.getIdentityNo()), DateUtils.DATE_PATTERN));
         String nickName = formDto.getRealName().substring(NumConstant.ZERO, NumConstant.ONE).concat(NumConstant.ZERO_STR.equals(user.getSex()) ? "女士" : "先生");
-        if (StringUtils.isNotBlank(formDto.getRoad())){
+        if (StringUtils.isNotBlank(formDto.getRoad())) {
             nickName = formDto.getRoad().concat("-").concat(nickName);
         }
         user.setNickname(nickName);
@@ -558,7 +561,7 @@ public class AppUserServiceImpl implements AppUserService {
         user.setRegisterTime(now);
         user.setLastLoginTime(now);
         user.setState(AppUserAuditStateEnum.UNDER_AUDIT.value());
-        user.setPartyFlag(formDto.getPartFlag()==null? YesOrNoEnum.NO.value():String.valueOf(formDto.getPartFlag()));
+        user.setPartyFlag(formDto.getPartFlag() == null ? YesOrNoEnum.NO.value() : String.valueOf(formDto.getPartFlag()));
         user.setRegisterWay(AppUserRegisterWayEnum.WX.value());
         user.setRegisterSource(AppUserRegisterSourceEnum.WP.value());
         user.setFaceImg(USER_FACE);
@@ -1574,16 +1577,18 @@ public class AppUserServiceImpl implements AppUserService {
         return userFeignClient.npmUserUpdate(userDTO);
     }
 
-    private UserDTO generateUserDTO(EpdcUserNpmRegisterFormDTO formDto){
+    private UserDTO generateUserDTO(EpdcUserNpmRegisterFormDTO formDto) {
         EpdcUserRegistFormDTO epdcUserRegistFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcUserRegistFormDTO.class);
         epdcUserRegistFormDTO.setRoad("");
-
+        if (null != formDto.getCouplingCommunity()) {
+            epdcUserRegistFormDTO.setCouplingCommunity(String.join(",", formDto.getCouplingCommunity()));
+        }
         this.commonVerifyUserRegisterData(epdcUserRegistFormDTO);
 
         Long deptId;
         if (formDto.getAllDeptIds() != null && formDto.getAllDeptIds().length > 1) {
             deptId = Long.parseLong(formDto.getAllDeptIds()[formDto.getAllDeptIds().length - 1]);
-        }else{
+        } else {
             UserDetail user = SecurityUser.getUser();
             deptId = user.getDeptId();
         }
@@ -1598,7 +1603,7 @@ public class AppUserServiceImpl implements AppUserService {
         CompleteDeptDTO completeDept = adminDeptResult.getData();
 
         epdcUserRegistFormDTO.setGridId(deptId);
-        UserDTO userDTO = this.packageUserDto(epdcUserRegistFormDTO,nmpWxUser.getUnionid(),nmpWxUser.getOpenid(),completeDept);
+        UserDTO userDTO = this.packageUserDto(epdcUserRegistFormDTO, nmpWxUser.getUnionid(), nmpWxUser.getOpenid(), completeDept);
         userDTO.setDeptId(deptId);
         userDTO.setPartyFlag(String.valueOf(formDto.getPartyFlag()));
         userDTO.setShibei(formDto.getShibei());
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java
index 760d5766e..79f0b840e 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java
@@ -12,7 +12,10 @@ import com.elink.esua.epdc.custom.dto.suggestion.TypeNode;
 import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
 import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
-import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.EpidemicSentryPostDTO;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.consult.form.GridForceListFormDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
@@ -246,7 +249,7 @@ public class CustomServiceImpl implements CustomService {
 
     @Override
     public Result saveTripInfo(TokenDto userDetail, SaveTripInfoFormDTO formDto) {
-        log.info("formDto:"+formDto);
+        log.info("formDto:" + formDto);
         if (null == userDetail) {
             return new Result().error("获取用户信息失败");
         }
@@ -273,7 +276,7 @@ public class CustomServiceImpl implements CustomService {
 
     @Override
     public Result getTripInfoList(TokenDto userDetail, GetTripInfoFormDTO formDto) {
-        log.info("formDto:"+formDto);
+        log.info("formDto:" + formDto);
         if (null == userDetail) {
             return new Result().error("获取用户信息失败");
         }
@@ -282,14 +285,20 @@ public class CustomServiceImpl implements CustomService {
     }
 
     @Override
-    public Result getTripInfoDetail( GetTripInfoFormDTO formDto) {
-        log.info("formDto:"+formDto);
+    public Result getTripInfoDetail(GetTripInfoFormDTO formDto) {
+        log.info("formDto:" + formDto);
         return customFeignClient.getTripInfoDetail(formDto);
     }
 
     @Override
     public Result deleteTripById(GetTripInfoFormDTO formDto) {
-        log.info("formDto:"+formDto);
+        log.info("formDto:" + formDto);
         return customFeignClient.deleteTripById(formDto);
     }
+
+    @Override
+    public Result listGridForce(GridForceListFormDTO formDto) {
+        log.info("formDto:" + formDto);
+        return customFeignClient.listGridForce(formDto);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/GridForceInfoDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/GridForceInfoDTO.java
new file mode 100755
index 000000000..39e128bbb
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/GridForceInfoDTO.java
@@ -0,0 +1,156 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.consult;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 网格力量信息
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-02
+ */
+@Data
+public class GridForceInfoDTO implements Serializable {
+
+
+    private static final long serialVersionUID = -5547515827043486675L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 用户姓名
+     */
+    private String realName;
+
+    /**
+     * 性别 0女  1男
+     */
+    private String sex;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
+    /**
+     * 身份证号
+     */
+    private String identityNo;
+
+    /**
+     * 头像访问地址
+     */
+    private String faceImg;
+
+    /**
+     * 工作单位
+     */
+    private String workUnit;
+
+    /**
+     * 职责类别id
+     */
+    private String dutyCategoryId;
+
+    /**
+     * 前端收费展示 0否  1是
+     */
+    private String showFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 居住网格id
+     */
+    private String deptId;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 删除标识 0：否，1：是
+     */
+    private String delFlag;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    ///////////////////下面的字段，为pc页面上送数据的绑定字段/////////////////////////////////
+
+    /**
+     * 新增是，选择所属网格，多选
+     */
+    private List<Long[]> selectedDeptIds;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/form/GridForceListFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/form/GridForceListFormDTO.java
new file mode 100644
index 000000000..e43633c86
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/form/GridForceListFormDTO.java
@@ -0,0 +1,48 @@
+package com.elink.esua.epdc.dto.consult.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/3/3 9:42
+ *  @Description: 获取网格内网格员公示信息 入参
+ */
+@Data
+public class GridForceListFormDTO implements Serializable {
+    private static final long serialVersionUID = 6657811237503660654L;
+
+
+    /**
+     * pageIndex : 9380
+     * pageSize : 77145
+     * timestamp : bvthA2vDrf
+     */
+
+    /**
+     * 页码，从1开始
+     */
+    private Integer pageIndex;
+
+    /**
+     * 页容量，默认10页
+     */
+    private Integer pageSize = 10;
+
+    /**
+     * 第一页查询发起时的时间
+     */
+    private String timestamp;
+
+    /**
+     * 网格id
+     */
+    private Long deptId;
+
+    /**
+     * 父级部门ID
+     */
+    private String parentDeptIds;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/GridForceListResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/GridForceListResultDTO.java
new file mode 100644
index 000000000..48e862c48
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/GridForceListResultDTO.java
@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto.consult.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author: qushutong
+ * @Date: 2020/3/3 9:33
+ * @Description: 获取网格内网格员公示信息
+ */
+@Data
+public class GridForceListResultDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 4048573836211284289L;
+
+    private String realName;
+    private String sex;
+    private String mobile;
+    private String dutyCategoryName;
+    private String remark;
+    private String workUnit;
+    private String faceImg;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridForceController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridForceController.java
new file mode 100644
index 000000000..aca8f01f3
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridForceController.java
@@ -0,0 +1,117 @@
+package com.elink.esua.epdc.modules.consult.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.annotation.MaskResponse;
+import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.consult.GridForceInfoDTO;
+import com.elink.esua.epdc.dto.consult.form.GridForceListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridForceListResultDTO;
+import com.elink.esua.epdc.modules.consult.excel.GridOperatorInfoExcel;
+import com.elink.esua.epdc.modules.consult.service.GridForceInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yan Lu
+ * @description 网格力量
+ * @create 2023/7/13 10:20
+ */
+@RestController
+@RequestMapping("gridForceinfo")
+public class GridForceController {
+
+    @Autowired
+    private GridForceInfoService gridForceInfoService;
+
+    @GetMapping("page")
+    @MaskResponse(fieldNames = {"mobile", "identityNo"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
+    @DataFilter(tableAlias = "t", deptId = "DEPT_ID", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<GridForceInfoDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<GridForceInfoDTO> page = gridForceInfoService.getEnterpriseInfoPageFromPc(params);
+        return new Result<PageData<GridForceInfoDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<GridForceInfoDTO> get(@PathVariable("id") String id) {
+        GridForceInfoDTO data = gridForceInfoService.get(id);
+        return new Result<GridForceInfoDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody GridForceInfoDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        //校验身份证
+        if (StringUtils.isNotBlank(dto.getIdentityNo())) {
+            String idenNoMsg = IdentityNoUtils.IdentityNoVerification(dto.getIdentityNo());
+            if (idenNoMsg != null) {
+                return new Result().error(idenNoMsg);
+            }
+        }
+        dto.setShowFlag(YesOrNoEnum.NO.value());
+        gridForceInfoService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody GridForceInfoDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        //校验身份证
+        if (StringUtils.isNotBlank(dto.getIdentityNo())) {
+            String idenNoMsg = IdentityNoUtils.IdentityNoVerification(dto.getIdentityNo());
+            if (idenNoMsg != null) {
+                return new Result().error(idenNoMsg);
+            }
+        }
+        gridForceInfoService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        gridForceInfoService.delete(ids);
+        return new Result();
+    }
+
+    @PostMapping("changeShowFlag")
+    public Result changeShowFlag(@RequestBody GridForceInfoDTO dto) {
+        gridForceInfoService.changeShowFlag(dto);
+        return new Result();
+    }
+
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<GridForceInfoDTO> list = gridForceInfoService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, GridOperatorInfoExcel.class);
+    }
+
+    /***
+     * 获取网格内网格员公示信息
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.consult.result.GridForceListResultDTO>>
+     * @author qushutong
+     * @date 2020/3/3 11:19
+     */
+    @PostMapping("listGridForce")
+    public Result<List<GridForceListResultDTO>> listPageGridForce(@RequestBody GridForceListFormDTO formDto) {
+        return gridForceInfoService.listPageGridForce(formDto);
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridForceInfoDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridForceInfoDao.java
new file mode 100755
index 000000000..c58e33ae8
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridForceInfoDao.java
@@ -0,0 +1,67 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.consult.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.consult.GridForceInfoDTO;
+import com.elink.esua.epdc.dto.consult.form.GridForceListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridForceListResultDTO;
+import com.elink.esua.epdc.modules.consult.entity.GridForceInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 网格员信息
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-02
+ */
+@Mapper
+public interface GridForceInfoDao extends BaseDao<GridForceInfoEntity> {
+
+    /**
+     * @return java.util.List<com.elink.esua.epdc.modules.consult.entity.GridForceInfoEntity>
+     * @Description pc查询网格员信息列表
+     * @Author songyunpeng
+     * @Date 2020/3/3
+     * @Param [params]
+     **/
+    List<GridForceInfoDTO> selectGridForceInfoPageFromPc(Map<String, Object> params);
+
+
+    /***
+     * 获取网格内网格员公示信息
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO>
+     * @author qushutong
+     * @date 2020/3/3 9:57
+     */
+    List<GridForceListResultDTO> selectListGridForce(GridForceListFormDTO formDto);
+
+    /**
+     * 查询需要修改的组织机构信息
+     *
+     * @return java.util.List<com.elink.esua.epdc.dto.consult.GridForceInfoDTO>
+     * @params [deptId]
+     * @author liuchuang
+     * @since 2020/3/7 14:09
+     */
+    List<GridForceInfoDTO> selectListOfOrganizationInfo(String deptId);
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/entity/GridForceInfoEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/entity/GridForceInfoEntity.java
new file mode 100755
index 000000000..85a83ef59
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/entity/GridForceInfoEntity.java
@@ -0,0 +1,114 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.consult.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 网格力量信息
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("epdc_grid_force_info")
+public class GridForceInfoEntity extends BaseEpdcEntity {
+
+
+    private static final long serialVersionUID = -8743963104454300507L;
+
+    /**
+     * 用户姓名
+     */
+    private String realName;
+
+    /**
+     * 性别 0女  1男
+     */
+    private String sex;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
+    /**
+     * 身份证号
+     */
+    private String identityNo;
+
+    /**
+     * 头像访问地址
+     */
+    private String faceImg;
+
+    /**
+     * 工作单位
+     */
+    private String workUnit;
+
+    /**
+     * 职责类别id
+     */
+    private String dutyCategoryId;
+
+    /**
+     * 前端是否展示 0否  1是
+     */
+    private String showFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 居住网格id
+     */
+    private Long deptId;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/GridForceInfoService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/GridForceInfoService.java
new file mode 100755
index 000000000..0be18f224
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/GridForceInfoService.java
@@ -0,0 +1,145 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.consult.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.consult.GridForceInfoDTO;
+import com.elink.esua.epdc.dto.consult.form.GridForceListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridForceListResultDTO;
+import com.elink.esua.epdc.modules.consult.entity.GridForceInfoEntity;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 网格力量信息
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-02
+ */
+public interface GridForceInfoService extends BaseService<GridForceInfoEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GridForceInfoDTO>
+     * @author generator
+     * @date 2020-03-02
+     */
+    PageData<GridForceInfoDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GridForceInfoDTO>
+     * @author generator
+     * @date 2020-03-02
+     */
+    List<GridForceInfoDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GridForceInfoDTO
+     * @author generator
+     * @date 2020-03-02
+     */
+    GridForceInfoDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-02
+     */
+    void save(GridForceInfoDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-02
+     */
+    void update(GridForceInfoDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-03-02
+     */
+    void delete(String[] ids);
+
+    /**
+     * @return void
+     * @Description 是否展示
+     * @Author songyunpeng
+     * @Date 2020/3/2
+     * @Param [dto]
+     **/
+    void changeShowFlag(GridForceInfoDTO dto);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.consult.GridForceInfoDTO>
+     * @Description pc网格员列表
+     * @Author songyunpeng
+     * @Date 2020/3/3
+     * @Param [params]
+     **/
+    PageData<GridForceInfoDTO> getEnterpriseInfoPageFromPc(Map<String, Object> params);
+
+    /***
+     * 获取网格内网格员公示信息
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.consult.result.GridForceListResultDTO>
+     * @author qushutong
+     * @date 2020/3/3 9:52
+     */
+    Result<List<GridForceListResultDTO>> listPageGridForce(GridForceListFormDTO formDto);
+
+    /***
+     * 判断网格员职责类别下是够被关联
+     * @param
+     * @return boolean
+     * @author qushutong
+     * @date 2020/3/4 12:43
+     */
+    boolean isExistsByDutyId(String dutyCategoryId);
+
+    /**
+     * 修改组织机构信息
+     *
+     * @return void
+     * @params [dto]
+     * @author liuchuang
+     * @since 2020/3/7 1:23
+     */
+    void modifyOrganizationInfo(OrganizationModifyDTO dto);
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java
new file mode 100755
index 000000000..92ff5b957
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java
@@ -0,0 +1,230 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.consult.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.consult.GridForceInfoDTO;
+import com.elink.esua.epdc.dto.consult.form.GridForceListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridForceListResultDTO;
+import com.elink.esua.epdc.modules.consult.dao.GridForceInfoDao;
+import com.elink.esua.epdc.modules.consult.entity.GridForceInfoEntity;
+import com.elink.esua.epdc.modules.consult.service.GridForceInfoService;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
+import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 网格力量信息
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-02
+ */
+@Service
+public class GridForceInfoServiceImpl extends BaseServiceImpl<GridForceInfoDao, GridForceInfoEntity> implements GridForceInfoService {
+
+    @Resource
+    private AdminFeignClient adminFeignClient;
+
+    @Override
+    public PageData<GridForceInfoDTO> page(Map<String, Object> params) {
+        IPage<GridForceInfoEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, GridForceInfoDTO.class);
+    }
+
+    @Override
+    public List<GridForceInfoDTO> list(Map<String, Object> params) {
+        List<GridForceInfoEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GridForceInfoDTO.class);
+    }
+
+    private QueryWrapper<GridForceInfoEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GridForceInfoEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GridForceInfoDTO get(String id) {
+        GridForceInfoEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, GridForceInfoDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GridForceInfoDTO dto) {
+        GridForceInfoEntity entity = ConvertUtils.sourceToTarget(dto, GridForceInfoEntity.class);
+        if (StringUtils.isNotEmpty(dto.getDeptId())) {
+            fillDeptInfoByGridId(entity, Long.valueOf(dto.getDeptId()));
+        }else {
+            throw new RenException("请选择所属部门");
+        }
+        baseDao.insert(entity);
+    }
+
+    /**
+     * 组装网格人员机构信息
+     *
+     * @param gridOperator 网格员对象
+     * @param gridId       网格id
+     * @return void
+     * @author work@yujt.net.cn
+     * @date 2020/3/12 13:37
+     */
+    private void fillDeptInfoByGridId(GridForceInfoEntity gridOperator, Long gridId) {
+        Result<ParentAndAllDeptDTO> adminResult = adminFeignClient.getParentAndAllDept(String.valueOf(gridId));
+        if (!adminResult.success() || null == adminResult.getData()) {
+            return;
+        }
+        ParentAndAllDeptDTO deptInfo = adminResult.getData();
+        gridOperator.setAllDeptIds(deptInfo.getAllDeptIds());
+        gridOperator.setAllDeptNames(deptInfo.getAllDeptNames());
+        gridOperator.setParentDeptIds(deptInfo.getParentDeptIds());
+        gridOperator.setParentDeptNames(deptInfo.getParentDeptNames());
+        gridOperator.setDeptId(gridId);
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GridForceInfoDTO dto) {
+        GridForceInfoEntity entity = ConvertUtils.sourceToTarget(dto, GridForceInfoEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changeShowFlag(GridForceInfoDTO dto) {
+        GridForceInfoEntity GridForceInfoEntity = new GridForceInfoEntity();
+        GridForceInfoEntity.setId(dto.getId());
+        GridForceInfoEntity.setShowFlag(dto.getShowFlag());
+        updateById(GridForceInfoEntity);
+    }
+
+    @Override
+    public PageData<GridForceInfoDTO> getEnterpriseInfoPageFromPc(Map<String, Object> params) {
+        IPage<GridForceInfoDTO> page = getPage(params);
+        List<GridForceInfoDTO> list = baseDao.selectGridForceInfoPageFromPc(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+    @Override
+    public Result<List<GridForceListResultDTO>> listPageGridForce(GridForceListFormDTO formDto) {
+        if (null != formDto.getDeptId()) {
+            Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(formDto.getDeptId()));
+            if (null != parentResult) {
+                formDto.setParentDeptIds(parentResult.getData().getParentDeptIds());
+                formDto.setDeptId(null);
+            }
+        }
+        List<GridForceListResultDTO> list = baseDao.selectListGridForce(formDto);
+        return new Result<List<GridForceListResultDTO>>().ok(list);
+    }
+
+    @Override
+    public boolean isExistsByDutyId(String dutyCategoryId) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq(StringUtils.isNotBlank(dutyCategoryId), "DUTY_CATEGORY_ID", dutyCategoryId);
+        Integer integer = baseDao.selectCount(queryWrapper);
+        if (integer > 0) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void modifyOrganizationInfo(OrganizationModifyDTO dto) {
+        // 查询需要修改的组织机构信息
+        List<GridForceInfoDTO> gridList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString());
+        if (null != gridList && gridList.size() > 0) {
+            // 组织机构信息处理
+            List<GridForceInfoEntity> entities = handleOrganizationInfo(dto, gridList);
+            // 更新事件组织机构信息
+            updateBatchById(entities);
+        }
+    }
+
+    /**
+     * 组织机构信息处理
+     *
+     * @return java.util.List<com.elink.esua.epdc.modules.consult.entity.GridForceInfoEntity>
+     * @params [dto, gridList]
+     * @author liuchuang
+     * @since 2020/3/7 14:12
+     */
+    private List<GridForceInfoEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<GridForceInfoDTO> gridList) {
+        List<GridForceInfoEntity> entities = new ArrayList<>();
+        for (GridForceInfoDTO grid : gridList) {
+            GridForceInfoEntity entity = new GridForceInfoEntity();
+            if ("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(grid.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
+            }
+            if ("community_party".equals(dto.getTypeKey())) {
+                List<String> allDeptIds = Arrays.asList(grid.getAllDeptIds().split(","));
+                List<String> allDeptNames = Arrays.asList(grid.getAllDeptNames().split("-"));
+                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(grid.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
+            }
+            entities.add(entity);
+        }
+
+        return entities;
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridForceInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridForceInfoDao.xml
new file mode 100755
index 000000000..566e5879c
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridForceInfoDao.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.consult.dao.GridForceInfoDao">
+
+    <resultMap type="com.elink.esua.epdc.modules.consult.entity.GridForceInfoEntity" id="gridForceInfoMap">
+        <result property="id" column="ID"/>
+        <result property="realName" column="REAL_NAME"/>
+        <result property="sex" column="SEX"/>
+        <result property="sort" column="SORT"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="identityNo" column="IDENTITY_NO"/>
+        <result property="faceImg" column="FACE_IMG"/>
+        <result property="workUnit" column="WORK_UNIT"/>
+        <result property="dutyCategoryId" column="DUTY_CATEGORY_ID"/>
+        <result property="showFlag" column="SHOW_FLAG"/>
+        <result property="remark" column="REMARK"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
+        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
+        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="revision" column="REVISION"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <select id="selectGridForceInfoPageFromPc" resultType="com.elink.esua.epdc.dto.consult.GridForceInfoDTO">
+        select * from epdc_grid_force_info t
+        where DEL_FLAG = '0'
+        <if test="streetId != null and streetId != ''">
+            AND (find_in_set(#{streetId},PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND (find_in_set(#{communityId},PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND (find_in_set(#{gridId},PARENT_DEPT_IDS)
+            OR find_in_set(#{gridId},ALL_DEPT_IDS))
+        </if>
+        ORDER BY
+        SORT ASC,
+        CREATED_TIME DESC
+    </select>
+    <select id="selectListGridForce" resultType="com.elink.esua.epdc.dto.consult.result.GridForceListResultDTO">
+        SELECT
+            ei.REAL_NAME,
+            ei.SEX,
+            ei.MOBILE,
+            ei.REMARK,
+            ei.FACE_IMG,
+            SUBSTRING_INDEX(ei.ALL_DEPT_NAMES,'-',-1) AS workUnit,
+            ec.DUTY_CATEGORY_NAME
+        FROM
+        epdc_grid_force_info ei
+        LEFT JOIN epdc_grid_operator_duty_category ec ON ec.ID = ei.DUTY_CATEGORY_ID AND ec.DEL_FLAG = '0'
+        WHERE ei.DEL_FLAG = '0'
+        <if test="null != deptId">
+            AND ei.DEPT_ID = #{deptId}
+        </if>
+        <if test="null != parentDeptIds and parentDeptIds != ''">
+            AND ei.PARENT_DEPT_IDS LIKE concat('%', #{parentDeptIds})
+        </if>
+        ORDER BY
+        ei.SORT ASC,
+        ei.CREATED_TIME DESC
+    </select>
+
+    <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.consult.GridForceInfoDTO">
+        SELECT
+            ID,
+            PARENT_DEPT_IDS,
+            PARENT_DEPT_NAMES,
+            ALL_DEPT_IDS as allDeptIdsStr,
+            ALL_DEPT_NAMES
+        FROM
+            epdc_grid_force_info
+        WHERE
+            FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+    </select>
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/CachingUserInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/CachingUserInfoDTO.java
index 96ba7370c..cbbcec8e1 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/CachingUserInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/CachingUserInfoDTO.java
@@ -70,4 +70,9 @@ public class CachingUserInfoDTO {
      */
     private String remark;
 
+    /**
+     * 包联社区ID
+     */
+    private String couplingCommunity;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java
index b9d1c7438..a5d993898 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserDTO.java
@@ -395,4 +395,9 @@ public class UserDTO implements Serializable {
      * 用户Id
      */
     private String userId;
+
+    /**
+     * 包联社区
+     */
+    private String couplingCommunity;
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java
index d21e604b7..9343dea9b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java
@@ -81,4 +81,9 @@ public class EpdcUserNpmRegisterFormDTO implements Serializable {
      * 用户Id
      */
     private String userId;
+
+    /**
+     * 包联社区
+     */
+    private String[] couplingCommunity;
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserRegistFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserRegistFormDTO.java
index c00c35b30..97245f46c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserRegistFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserRegistFormDTO.java
@@ -73,4 +73,9 @@ public class EpdcUserRegistFormDTO implements Serializable {
      * 是否党员 0、否 1、是
      */
     private Integer partFlag;
+
+    /**
+     * 包联社区
+     */
+    private String couplingCommunity;
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java
index 51475f289..fac09f9c5 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java
@@ -35,5 +35,6 @@ public class EpdcUserInfoResultDTO implements Serializable {
     private String workType;
     private String workIndustry;
     private Integer shibei;
+    private String couplingCommunity;
 
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java
index 62b46d5ad..4c0317aad 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java
@@ -143,4 +143,9 @@ public class ReportPartyDTO implements Serializable {
      * 审核信息
      */
     private String examineMsg;
+
+    /**
+     * 包联社区
+     */
+    private String[] couplingCommunity;
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java
index 9477b5f13..bdece00b5 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java
@@ -120,5 +120,8 @@ public class ReportPartyEntity extends DeptScope {
      */
     private String examineMsg;
 
-
+    /**
+     * 包联社区
+     */
+    private String couplingCommunity;
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
index f16bcff89..0d48c6df9 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
@@ -99,6 +99,9 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
             result.setAllDeptIds(entity.getAllDeptIds().split(","));
             result.setDeptId(Long.parseLong(entity.getDeptId()));
         }
+        if (StringUtils.isNotEmpty(entity.getCouplingCommunity())) {
+            result.setCouplingCommunity(entity.getCouplingCommunity().split(","));
+        }
         return result;
     }
 
@@ -125,6 +128,7 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
             entity.setParentDeptIds(deptDTO.getParentDeptIds());
             entity.setParentDeptNames(deptDTO.getParentDeptNames());
         }
+        entity.setCouplingCommunity(String.join(",", dto.getCouplingCommunity()));
         entity.setStatus(0);
         insert(entity);
     }
@@ -152,9 +156,10 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
             entity.setParentDeptIds(deptDTO.getParentDeptIds());
             entity.setParentDeptNames(deptDTO.getParentDeptNames());
         }
-        if (Objects.equals(0,entity.getStatus())){
+        if (Objects.equals(0, entity.getStatus())) {
             entity.setExamineMsg(null);
         }
+        entity.setCouplingCommunity(String.join(",", dto.getCouplingCommunity()));
         updateById(entity);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java
index 2f273f383..75fd965e2 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/UserEntity.java
@@ -293,4 +293,9 @@ public class UserEntity extends DeptScope {
      * 所属行业其他
      */
     private String workIndustryText;
+
+    /**
+     * 包联单位
+     */
+    private String couplingCommunity;
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
index 3d17594d7..5afc5cfaa 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
@@ -497,16 +497,16 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public Result verifyUserRegisterData(EpdcUserRegistFormDTO formDto) {
         // 手机号查重
-        String mobile = formDto.getMobile();
-        if (StringUtils.isNotBlank(mobile)) {
-            QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
-            wrapper.eq(FieldConstant.MOBILE, mobile);
-            wrapper.ne(formDto.getUserId()!=null,FieldConstant.ID,formDto.getUserId());
-            Integer count = this.baseDao.selectCount(wrapper);
-            if (count > NumConstant.ZERO) {
-                return new Result().error("手机号已被注册");
-            }
-        }
+//        String mobile = formDto.getMobile();
+//        if (StringUtils.isNotBlank(mobile)) {
+//            QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
+//            wrapper.eq(FieldConstant.MOBILE, mobile);
+//            wrapper.ne(formDto.getUserId()!=null,FieldConstant.ID,formDto.getUserId());
+//            Integer count = this.baseDao.selectCount(wrapper);
+//            if (count > NumConstant.ZERO) {
+//                return new Result().error("手机号已被注册");
+//            }
+//        }
 
         // 身份证号查重
         String identityNo = formDto.getIdentityNo();
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index ad1720e5d..8874ca7d8 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -29,7 +29,8 @@
             eugr.PARENT_DEPT_IDS AS parentDeptIds,
             eugr.PARENT_DEPT_NAMES AS parentDeptNames,
             eugr.ALL_DEPT_IDS AS allDeptIds,
-            eugr.ALL_DEPT_NAMES AS allDeptNames
+            eugr.ALL_DEPT_NAMES AS allDeptNames,
+            eu.COUPLING_COMMUNITY
         FROM
             epdc_user eu
         Left Join (select * from  epdc_user_grid_relation  where USER_ID = #{id} order by UPDATED_TIME desc limit 0,1) eugr
@@ -469,6 +470,7 @@
         eu.REAL_NAME,
         eu.STATE,
         eu.REMARK,
+        eu.COUPLING_COMMUNITY,
         (select r.GRID_ID
         from epdc_user_grid_relation r
         where r.USER_ID=eu.ID