diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index 57384ded8..36eee7c03 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -92,12 +92,12 @@
 
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                <!--                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
-                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
+                                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
+                <!--<gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
                 </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-                <!--                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>-->
+                <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
+                                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
                 <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
                 <!--                <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
                 <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
index 07d58a844..773c29702 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
@@ -22,7 +22,7 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/7 9:27
  */
-@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class,url = "http://localhost:9068")
 public interface UserFeignClient {
 
     /**
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
index bf187bdfc..36534d869 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
@@ -13,6 +13,11 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-admin-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-user-client</artifactId>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
new file mode 100644
index 000000000..7655e329c
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/5 14:44
+ */
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+public interface AdminFeignClient {
+
+    /**
+     * 根据部门ID，获取下属所有网格ID
+     *
+     * @param pid
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.Long>>
+     * @author yujintao
+     * @date 2019/9/5 14:49
+     */
+    @GetMapping("/sys/dept/listGridId/{pid}")
+    Result<List<Long>> listGridIdByDeptPid(@PathVariable("pid") Long pid);
+
+    /**
+     * 根据部门ID获取上级所有部门信息
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<ParentAndAllDeptDTO>
+     * @author gp
+     * @date 2019-11-29
+     */
+    @GetMapping("/sys/dept/getParentAndAllDept/{deptId}")
+    Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId);
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
new file mode 100644
index 000000000..7ec1c523a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.feign.AdminFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/5 14:44
+ */
+@Component
+public class AdminFeignClientFallback implements AdminFeignClient {
+
+    @Override
+    public Result<List<Long>> listGridIdByDeptPid(Long pid) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listGridIdByDeptPid", pid);
+    }
+
+    @Override
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(String depId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId);
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index 2eb1ee895..7bf9a0b7b 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -28,16 +28,19 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
+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.config.StreamUtils;
 import com.elink.esua.epdc.dao.PartyMembersDao;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.dto.PartyTagRelationDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcPartyErroyResultDTO;
 import com.elink.esua.epdc.entity.PartyMembersEntity;
 import com.elink.esua.epdc.excel.PartyMembersExcel;
+import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.PartyMembersRedis;
 import com.elink.esua.epdc.service.PartyMembersService;
 import com.elink.esua.epdc.service.PartyTagRelationService;
@@ -64,7 +67,8 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     @Autowired
     private PartyTagRelationService partyTagRelationService;
 
-
+    @Autowired
+    private AdminFeignClient adminFeignClient;
     @Override
     public PageData<PartyMembersDTO> page(Map<String, Object> params) {
         IPage<PartyMembersEntity> page = baseDao.selectPage(
@@ -100,7 +104,8 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     public PartyMembersDTO get(String id) {
         PartyMembersDTO partyMembersDTO = baseDao.selectByIdNew(id);
         if(partyMembersDTO.getDeptStrIds()!=null){
-            partyMembersDTO.setAllDeptIds(partyMembersDTO.getDeptStrIds().split(","));
+            String depts[]=partyMembersDTO.getDeptStrIds().split(",");
+            partyMembersDTO.setAllDeptIds(Arrays.copyOfRange(depts,depts.length-3,depts.length));
         }
         return partyMembersDTO;
     }
@@ -132,11 +137,16 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     @Transactional(rollbackFor = Exception.class)
     public void update(PartyMembersDTO dto) {
         PartyMembersEntity entity = ConvertUtils.sourceToTarget(dto, PartyMembersEntity.class);
-        //修改数据库结构
-        entity.setAllDeptNames(dto.getStreetName()+"-"+dto.getCommunityName()+"-"+dto.getGridName());
-        entity.setAllDeptIds(dto.getStreetId()+","+dto.getCommunityId()+","+dto.getGridId());
-        entity.setParentDeptNames(dto.getStreetName()+"-"+dto.getCommunityName());
-        entity.setParentDeptIds(dto.getStreetId()+","+dto.getCommunityId());
+        Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getGridId()));
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        }else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
         updateById(entity);
 
         partyTagRelationService.deleteByPartyId(entity.getId());
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
index 08bfbaedd..3d895fdcb 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
@@ -4,6 +4,8 @@ server:
     context-path: /app-user
 
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: epdc-user-server
   # 环境 dev|test|prod
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
index 4780b3b6f..3572a436b 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -87,12 +87,7 @@
     <!--管理系统-->
     <select id="selectByIdNew"  resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
 		SELECT
-            pm.CADRE_FLAG,
-            pm.CREATED_BY,pm.CREATED_TIME,
-            pm.DEPT_ID,
-            pm.ID,pm.IDENTITY_NO,pm.MOBILE,pm.POST,
-            pm.POST_VALUE,pm.REAL_NAME,pm.REGIST_FLAG,pm.REGIST_TIME,
-            pm.REVISION,
+            pm.*,
             pm.ALL_DEPT_IDS as deptStrIds,
             GROUP_CONCAT(DISTINCT(partytag.TAG_ID)) AS tagIds
         FROM
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 e4f013586..22529ef84 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
@@ -203,8 +203,8 @@
             eu.VILLAGE_NAME AS villageName,
             eu.DWELLING_PLACE as dwellingPlace,
             '1' as authenticatedFlag,
-            SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',1) as streetName,
-            SUBSTRING_INDEX(SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',2),'-',-1)as communityName,
+            SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-3) as streetName,
+            SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-2)as communityName,
             SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-1)  as gridName,
             eu.PARTY_FLAG as partyFlag,
             epm.CADRE_FLAG as cadreFlag,
@@ -233,8 +233,8 @@
             eu.VILLAGE_NAME AS villageName,
             eu.DWELLING_PLACE AS dwellingPlace,
             '0' AS authenticatedFlag,
-            SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',1) as streetName,
-            SUBSTRING_INDEX(SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',2),'-',-1)as communityName,
+            SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-3) as streetName,
+            SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-2)as communityName,
             SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-1)  as gridName,
             eu.PARTY_FLAG AS partyFlag,
             epaf.CADRE_FLAG AS cadreFlag,