diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
index e1fb43ca..6131fcc0 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
@@ -224,6 +224,18 @@ public class SysDeptController {
         return sysDeptService.getDeptTreeWithTypeKey();
     }
 
+    /**
+     * 组织机构树：街道-社区-网格
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     * @author lc
+     * @since 2021/8/17 16:05
+     */
+    @GetMapping("party/getOrgTree")
+    public Result<DeptOption> getOrgTree() {
+        return sysDeptService.getOrgTree();
+    }
+
     /**
      * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
index b0eca256..2dd4abf9 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
@@ -153,6 +153,15 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      */
     List<DeptTreeWithTypeKeyDTO> selectListDeptTreeWithTypeKey();
 
+    /**
+     * 组织机构树：街道-社区-网格
+     *
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.DeptTreeWithTypeKeyDTO>
+     * @author lc
+     * @since 2021/8/17 15:56
+     */
+    List<DeptTreeWithTypeKeyDTO> selectListOrgTree();
+
     /**
      * @param params
      * @return java.util.List<com.elink.esua.epdc.dto.CompleteDeptDTO>
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
index f4f4f00b..ccdc4f12 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
@@ -218,6 +218,15 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      */
     Result<DeptOption> getDeptTreeWithTypeKey();
 
+    /**
+     * 组织机构树：街道-社区-网格
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     * @author lc
+     * @since 2021/8/17 16:03
+     */
+    Result<DeptOption> getOrgTree();
+
     /**
      * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 1b2ec1ad..89c5866a 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -684,6 +684,61 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         redisUtils.set(RedisKeys.getAllDeptOptionKeyWithTypeKey(), option);
     }
 
+    private void packgeAllOrgOption() {
+        List<DeptTreeWithTypeKeyDTO> deptList = baseDao.selectListOrgTree();
+        JSONObject node;
+        JSONArray headNodes = new JSONArray();
+        for (DeptTreeWithTypeKeyDTO deptItemDto : deptList) {
+            if (deptItemDto.getPid().longValue() == NumConstant.ZERO_L) {
+                node = new JSONObject();
+                node.put("value", deptItemDto.getId());
+                node.put("label", deptItemDto.getName());
+                node.put("typeKey", deptItemDto.getTypeKey());
+                headNodes.add(node);
+            }
+        }
+        // 用于存放所有父级节点
+        JSONArray parent;
+        parent = headNodes;
+        // 用于存放所有子级节点
+        JSONArray allChildren = new JSONArray();
+        JSONArray children;
+        // 用于存放单个子级节点
+        JSONObject childNode;
+        // 存放其余未处理的类别(节点)
+        List<DeptTreeWithTypeKeyDTO> others = this.getOtherDeptWithTypeKey(deptList, parent);
+
+        while (!others.isEmpty()) {
+            for (int i = 0; i < parent.size(); i++) {
+                node = parent.getJSONObject(i);
+                children = new JSONArray();
+                for (DeptTreeWithTypeKeyDTO categoryTreeDto : others) {
+                    if (categoryTreeDto.getPid().equals(node.get("value"))) {
+                        childNode = new JSONObject();
+                        childNode.put("value", categoryTreeDto.getId());
+                        childNode.put("label", categoryTreeDto.getName());
+                        childNode.put("typeKey", categoryTreeDto.getTypeKey());
+                        children.add(childNode);
+                        allChildren.add(childNode);
+                    }
+                }
+                if (!children.isEmpty()) {
+                    node.put("children", children);
+                }
+            }
+            parent = allChildren;
+
+            others = this.getOtherDeptWithTypeKey(others, parent);
+
+        }
+        //存放到redis中
+        List<JSONArray> cache = Lists.newArrayList();
+        cache.add(headNodes);
+        DeptOption option = new DeptOption();
+        option.setOptions(cache.get(0));
+        redisUtils.set(RedisKeys.getAllOrgOptionKey(), option);
+    }
+
 
     List<DeptTreeDTO> getOtherDept(List<DeptTreeDTO> deptList, JSONArray parent) {
         List<Long> already = Lists.newArrayList();
@@ -748,6 +803,17 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return new Result<DeptOption>().ok((DeptOption) obj);
     }
 
+    @Override
+    public Result<DeptOption> getOrgTree() {
+        String deptKey = RedisKeys.getAllOrgOptionKey();
+        Object obj = redisUtils.get(deptKey);
+        if (null == obj) {
+            this.packgeAllOrgOption();
+            obj = redisUtils.get(deptKey);
+        }
+        return new Result<DeptOption>().ok((DeptOption) obj);
+    }
+
     /**
      * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
index bc767365..d78da577 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
@@ -254,6 +254,18 @@
         where sd.del_flag='0'
         and sd.type_key in ('district_party','street_party','street_dept')
     </select>
+    <select id="selectListOrgTree"
+            resultType="com.elink.esua.epdc.dto.epdc.DeptTreeWithTypeKeyDTO">
+        SELECT
+            sd.id,
+            sd.pid,
+            sd.`name`,
+            sd.type_key
+        FROM
+            sys_dept sd
+            where sd.del_flag='0' and sd.type_key in ('street_party', 'community_party', 'grid_party') and sd.ID not in(select dept_id from sys_dept_config t where t.del_flag ='0')
+    </select>
+
     <select id="selectListDeptTreeWithTypeKey"
             resultType="com.elink.esua.epdc.dto.epdc.DeptTreeWithTypeKeyDTO">
         SELECT
@@ -263,7 +275,7 @@
             sd.type_key
         FROM
             sys_dept sd
-            where sd.del_flag='0' and sd.ID not in(select dept_id from sys_dept_config t where t.del_flag ='0' and  congig_type = 'screen_not_dept')
+        where sd.del_flag='0' and sd.ID not in(select dept_id from sys_dept_config t where t.del_flag ='0')
     </select>
 
     <select id="selectListOfDeptInfoByTypeKey" resultType="com.elink.esua.epdc.dto.SysDeptDTO">
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
index 1bdedbbc..5d686c40 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
@@ -191,6 +191,17 @@ public class RedisKeys {
         return rootPrefix.concat("options:dept:allWithTypeKey:");
     }
 
+    /**
+     * 组织机构树：街道-社区-网格
+     *
+     * @return java.lang.String
+     * @author lc
+     * @since 2021/8/17 16:03
+     */
+    public static String getAllOrgOptionKey() {
+        return rootPrefix.concat("options:org:all:");
+    }
+
     /**
      * @param
      * @return java.lang.String
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 8d2ca093..8b4aff6a 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
@@ -116,6 +116,16 @@ public interface AdminFeignClient {
     @GetMapping("sys/dept/party/getDeptTreeWithTypeKey")
     Result<DeptOption> getDeptTreeWithTypeKey();
 
+    /**
+     * 组织机构树：街道-社区-网格
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     * @author lc
+     * @since 2021/8/17 16:08
+     */
+    @GetMapping("sys/dept/party/getOrgTree")
+    Result<DeptOption> getOrgTree();
+
     /**
      * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
      *
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 ae4877c0..a051bf3c 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
@@ -62,6 +62,11 @@ public class AdminFeignClientFallback implements AdminFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTreeWithTypeKey");
     }
 
+    @Override
+    public Result<DeptOption> getOrgTree() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getOrgTree");
+    }
+
     @Override
     public Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getListSimpleDictInfo", 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 ee7c3441..6dfac9af 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
@@ -1702,7 +1702,7 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public Result<DeptOption> getDeptTreeWithTypeKey() {
-        return adminFeignClient.getDeptTreeWithTypeKey();
+        return adminFeignClient.getOrgTree();
     }
 
     @Override