diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java
index 6bac3b44..094f2ffc 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java
@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO;
@@ -13,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 /**
- * 移动端接口-自定义模块   \com\elink\esua\epdc\controller\ApiCustomInfoController.java
+ * 移动端接口-自定义模块
  * @author zhangyong
  * @Date 2020/05/20
  */
@@ -38,13 +40,15 @@ public class ApiCustomInfoController {
 
     /**
      *  移动端获取 了解锦水-硬核管理接口
+     *
+     *  @param userDetail
      * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO>>
      * @Author zhangyong
      * @Date 13:41 2020-05-20
      **/
     @GetMapping("deptinfo/list")
-    public Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO) {
-        return customService.listDeptInfo(formDTO);
+    public Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(@LoginUser TokenDto userDetail, EpdcDeptInfoFormDTO formDTO) {
+        return customService.listDeptInfo(userDetail, formDTO);
     }
 }
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 8b975bfc..ecaa693b 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
@@ -1,5 +1,6 @@
 package com.elink.esua.epdc.service;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptOption;
 import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
@@ -45,10 +46,12 @@ public interface CustomService {
 
 	/**
 	 *  移动端获取 了解锦水-硬核管理接口
+     *
+     *  @param userDetail
 	 * @param formDTO
 	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO>>
 	 * @Author zhangyong
 	 * @Date 13:41 2020-05-20
 	 **/
-	Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO);
+	Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(TokenDto userDetail, EpdcDeptInfoFormDTO formDTO);
 }
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 0f0922da..21dbc4d3 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
@@ -1,5 +1,6 @@
 package com.elink.esua.epdc.service.impl;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptOption;
@@ -89,7 +90,8 @@ public class CustomServiceImpl implements CustomService {
 	}
 
 	@Override
-	public Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO) {
+	public Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(TokenDto userDetail, EpdcDeptInfoFormDTO formDTO) {
+        formDTO.setDeptId(userDetail.getGridId());
 		return customFeignClient.selectListDeptInfo(formDTO);
 	}
 }
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcDeptInfoFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcDeptInfoFormDTO.java
index 08398bbe..9a0c5974 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcDeptInfoFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcDeptInfoFormDTO.java
@@ -26,4 +26,9 @@ public class EpdcDeptInfoFormDTO implements Serializable {
      */
     @Min(value = 1, message = "页容量必须大于0")
     private Integer pageSize;
+
+    /**
+     * 部门id
+     */
+    private long deptId;
 }
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/dept/DeptInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/dept/DeptInfoDao.xml
index c52fe5e8..0d999d99 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/dept/DeptInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/dept/DeptInfoDao.xml
@@ -33,6 +33,9 @@
         FROM
             epdc_dept_info
         WHERE DEL_FLAG = 0
+        <if test="deptId != null and deptId != ''">
+            and DEPT_ID = #{deptId}
+        </if>
         ORDER BY CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>