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..431f481 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
@@ -387,4 +387,31 @@ public class SysDeptController {
         return new Result<List<SysDeptDTO>>().ok(data);
     }
 
+    /**
+     * @return io.pingyin.modules.sys.dto.AllDeptDTO
+     * @describe: 根据网格名称获取部门信息
+     * @author wgf
+     * @date 2022/4/25 21:54
+     * @params [gridName]
+     */
+    @GetMapping("getAllDeptInfoByGridName/{gridName}")
+    public Result<AllDeptDTO> getAllDeptInfoByGridName(@PathVariable String gridName) {
+        AllDeptDTO data = sysDeptService.getAllDeptInfoByGridName(gridName);
+        return new Result<AllDeptDTO>().ok(data);
+    }
+
+    /**
+     * @return io.pingyin.modules.sys.dto.AllDeptDTO
+     * @describe: 根据网格gridName获取所有相关部门
+     * @author wgf
+     * @date 2022/4/25 21:54
+     * @params [gridName]
+     */
+    @GetMapping("getAllDeptInfoByName/{gridName}")
+    public Result<AllDeptDTO> getAllDeptInfoByName(@PathVariable String gridName) {
+        AllDeptDTO data = sysDeptService.getAllDeptInfoByName(gridName);
+        return new Result<AllDeptDTO>().ok(data);
+    }
+
+
 }
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..2008588 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
@@ -221,4 +221,18 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     List<SysDeptDTO> getDeptInfoByPid(DeptIdByPidFormDTO dto);
+
+    AllDeptDTO getAllDeptInfoByGridName(@Param("gridName") String gridName);
+
+    /**
+     * 根据网格gridName获取所有相关部门
+     *
+     * @param gridName
+     * @return io.pingyin.modules.sys.dto.AllDeptDTO
+     * @author wgf
+     * @date 2021/11/22 14:53
+     */
+    AllDeptDTO getDeptInfoByName(@Param("gridName") String gridName);
+
+
 }
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..4a24f94 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
@@ -302,4 +302,23 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     List<SysDeptDTO> getDeptInfoByPid(DeptIdByPidFormDTO dto);
+
+    /**
+     * @return io.pingyin.modules.sys.dto.AllDeptDTO
+     * @describe: 根据网格名称获取部门信息
+     * @author wgf
+     * @date 2022/4/25 21:54
+     * @params [gridName]
+     */
+    AllDeptDTO getAllDeptInfoByGridName(String gridName);
+
+    /**
+     * 根据网格gridName获取所有相关部门
+     *
+     * @param gridName
+     * @return io.pingyin.modules.sys.dto.AllDeptDTO
+     * @author wgf
+     * @date 2021/11/22 14:53
+     */
+    AllDeptDTO getAllDeptInfoByName(String gridName);
 }
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..f19283f 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
@@ -1141,4 +1141,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     public List<SysDeptDTO> getDeptInfoByPid(DeptIdByPidFormDTO dto) {
         return baseDao.getDeptInfoByPid(dto);
     }
+
+    @Override
+    public AllDeptDTO getAllDeptInfoByGridName(String gridName) {
+        return baseDao.getAllDeptInfoByGridName(gridName);
+    }
+
+    @Override
+    public AllDeptDTO getAllDeptInfoByName(String gridName) {
+        return baseDao.getDeptInfoByName(gridName);
+    }
+
 }
diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
index c23d9d0..f06c0c9 100644
--- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
+++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
@@ -359,4 +359,45 @@
           AND t.pid = #{pid}
           order by t.id
     </select>
+
+    <select id="getAllDeptInfoByGridName" resultType="com.elink.esua.epdc.dto.AllDeptDTO">
+
+		SELECT
+			grid.id AS gridId,
+			grid.`name` AS gridName,
+			grid.dept_id as gridDeptId,
+			comm.id AS communityId,
+			comm.`name` AS communityName,
+			comm.dept_id as communityDeptId,
+			street.id AS streetId,
+			street.`name` AS streetName,
+			street.dept_id as streetDeptId
+		FROM
+			sys_dept grid
+		LEFT JOIN sys_dept comm ON comm.id = grid.pid
+		LEFT JOIN sys_dept street ON street.id = comm.pid
+		WHERE
+			grid.tags LIKE '%grid_party%'
+			AND grid.name = #{gridName}
+
+	</select>
+
+    <select id="getDeptInfoByName" resultType="com.elink.esua.epdc.dto.AllDeptDTO">
+		SELECT
+			grid.dept_id AS gridId,
+			grid.`name` AS gridName,
+			comm.dept_id AS communityId,
+			comm.`name` AS communityName,
+			street.dept_id AS streetId,
+			street.`name` AS streetName,
+			street.id AS deptId,
+			street.`name` AS deptName
+		FROM
+			sys_dept grid
+		LEFT JOIN sys_dept comm ON comm.id = grid.pid
+		LEFT JOIN sys_dept street ON street.id = comm.pid
+		WHERE
+			grid.tags LIKE '%grid_party%'
+			AND grid.name = #{gridName}
+	</select>
 </mapper>