diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
index b8dbb3a..664fdd9 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
@@ -24,6 +24,8 @@ import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptAreaCodeFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.form.DeptInfoFormDTO;
+import com.elink.esua.epdc.dto.result.DeptInfoResultDTO;
 import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService;
 import com.elink.esua.epdc.service.SysDeptService;
 import io.swagger.annotations.Api;
@@ -128,6 +130,20 @@ public class SysDeptController {
         return sysDeptService.listGridIdByPid(pid);
     }
 
+
+    /**
+     * @param formDTO
+     * @Author: makunhua
+     * @Note: 根据标签或者父id查询部门列表信息
+     * @Date: 13:42 2021/11/22
+     * @Modified by:
+     */
+    @GetMapping("deptInfo")
+    public Result<List<DeptInfoResultDTO>> deptInfo(DeptInfoFormDTO formDTO) {
+        List<DeptInfoResultDTO> list = sysDeptService.deptInfo(formDTO);
+        return new Result<List<DeptInfoResultDTO>>().ok(list);
+    }
+
     /**
      * 通过网格ID获取该网格所有上级机构
      *
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
index 562106a..f956cc1 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
@@ -359,6 +359,24 @@ public class SysUserController {
         return new Result().ok(deptOption);
     }
 
+    /**
+     * 不要网格
+     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     * @author zhy
+     * @date 2022/6/9 10:08
+     */
+    @GetMapping("agencyOptions/getByLoginUser")
+    public Result<DeptOption> getUserAgencyOption() {
+        UserDetail user = SecurityUser.getUser();
+        DeptOption deptOption = optSysDeptService.getDeptOption(user.getId(), user.getDeptIdList(),
+                OrganizationTypeConstant.ORG_TYPE_STREET_PARTY,
+                OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY);
+        return new Result().ok(deptOption);
+    }
+
+
     /**
      * 获取用户部门多层结构，用户前端显示，请求需携带token
      * <p>调接口，从redis获取{@link SysUserController#packageUserDeptOption(Long)}接口生成的数据。</p>
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
index 3850bfe..f38a8df 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
@@ -15,6 +15,8 @@ import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.form.DeptInfoFormDTO;
+import com.elink.esua.epdc.dto.result.DeptInfoResultDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -77,6 +79,10 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      */
     CompleteDeptDTO getCompleteDept(@Param("gridId") Long gridId);
 
+    SysDeptEntity selectDeptPidByDeptId(Long agencyId);
+
+    List<DeptInfoResultDTO> deptInfo(DeptInfoFormDTO formDTO);
+
     /**
      * 通过网格ID获取该网格所有上级机构
      *
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
index 90c01cf..0e474d3 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
@@ -91,4 +91,7 @@ public class SysDeptEntity extends BaseEntity {
      */
     private String partyCode;
 
+    @TableField(exist = false)
+    private String deptId;
+
 }
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
index 21431bf..9b52430 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
@@ -18,6 +18,8 @@ import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptAreaCodeFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.form.DeptInfoFormDTO;
+import com.elink.esua.epdc.dto.result.DeptInfoResultDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 
 import java.util.List;
@@ -68,6 +70,8 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      */
     Result<List<Long>> listGridIdByPid(Long pid);
 
+    List<DeptInfoResultDTO> deptInfo(DeptInfoFormDTO formDTO);
+
     /**
      * 通过网格ID获取该网格所有上级机构
      *
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 06e36bc..a2200b7 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -44,6 +44,8 @@ import com.elink.esua.epdc.dto.epdc.result.AreaCodeChildResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.AreaCodeParentResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptAreaCodeResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.form.DeptInfoFormDTO;
+import com.elink.esua.epdc.dto.result.DeptInfoResultDTO;
 import com.elink.esua.epdc.entity.AdminImgEntity;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.entity.SysDeptInfoEntity;
@@ -416,6 +418,33 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return new Result().ok(deptIdList);
     }
 
+
+    @Override
+    public List<DeptInfoResultDTO> deptInfo(DeptInfoFormDTO formDTO) {
+        long countryId = 370124L;
+        if (SecurityUser.getUser().getSuperAdmin() != NumConstant.ONE && countryId != SecurityUser.getUser().getDeptId()) {
+            List<Long> deptIdList = SecurityUser.getUser().getDeptIdList();
+            if (SecurityUser.getUser().getDeptId() != null) {
+                SysDeptEntity deptEntity = baseDao.selectDeptPidByDeptId(SecurityUser.getUser().getDeptId());
+                // 如果这是网格员，就将社区ID放进权限（更高级部门也是）
+                if (deptEntity != null) {
+                    deptIdList.add(deptEntity.getId());
+                    SysDeptEntity pDeptEntity = baseDao.selectDeptPidByDeptId(deptEntity.getId());
+                    // 如果这是网格员，还要将街道ID放进权限（更高级部门也是）
+                    if (pDeptEntity != null) {
+                        deptIdList.add(pDeptEntity.getId());
+                    }
+                }
+                // 将所属部门的权限也放进来
+                SysDeptEntity entity = baseDao.getById(SecurityUser.getUser().getDeptId());
+                deptIdList.add(entity.getId());
+            }
+
+            formDTO.setDeptIdList(deptIdList);
+        }
+        return baseDao.deptInfo(formDTO);
+    }
+
     @Override
     public Result<CompleteDeptDTO> getCompleteDept(String gridId) {
         Long gridIdL = null;
diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
index c23d9d0..037637b 100644
--- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
+++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
@@ -359,4 +359,48 @@
           AND t.pid = #{pid}
           order by t.id
     </select>
+    <select id="deptInfo" resultType="com.elink.esua.epdc.dto.result.DeptInfoResultDTO">
+        SELECT
+        d.id,
+        d.pid,
+        d.`NAME` AS NAME,
+        d.sort,
+        d.create_date,
+        d.type_key as tags,
+        d.area_code,
+        d.id AS deptId,
+        p.id AS dept_pid
+        FROM
+        sys_dept d
+        LEFT JOIN sys_dept p ON d.pid = p.id
+        <where>
+            <if test="tags!=null and tags!=''">
+                and d.type_key = #{tags}
+            </if>
+            <if test="pid!=null and pid!=''">
+                and d.pid =#{pid}
+            </if>
+            <if test="deptPid!=null and deptPid!=''">
+                and p.id =#{deptPid}
+            </if>
+            <if test="deptIdList!=null and deptIdList.size() > 0">
+                and d.id in
+                <foreach collection="deptIdList" item="deptId" separator="," open="(" close=")">
+                    #{deptId}
+                </foreach>
+            </if>
+        </where>
+        ORDER BY
+        d.sort,d.id,d.create_date DESC
+    </select>
+    <select id="selectDeptPidByDeptId" resultType="com.elink.esua.epdc.entity.SysDeptEntity">
+		SELECT
+			p.*
+		FROM
+			sys_dept d
+			LEFT JOIN sys_dept p ON p.id = d.pid
+		WHERE
+			d.id = #{agencyId}
+			AND p.pid != 0
+	</select>
 </mapper>
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index 201e33e..982b1ff 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit 201e33eb2576b5358359b57b55d97cfce2b535dc
+Subproject commit 982b1ff01e69e7cb48180e3d68c94664605ae73e
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index 78ac21b..5b077ff 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit 78ac21be56ad09a008b97539aad5f867f817d3a3
+Subproject commit 5b077ffda98e46ce47e9c5540dabbc50f092968d
diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan
index 6c53fd9..db92131 160000
--- a/epdc-cloud-parent-yushan
+++ b/epdc-cloud-parent-yushan
@@ -1 +1 @@
-Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d
+Subproject commit db9213163f8005cba05ad21334bebb72484174b7