From aae491042b701206cfed341d21d3beb6e89a4e16 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 6 Jan 2021 10:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/controller/SysDeptController.java     | 4 ++--
 epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml     | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

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 0160678..b68e0e0 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
@@ -50,8 +50,8 @@ public class SysDeptController {
 
     @GetMapping("list")
     @ApiOperation("列表")
-    public Result<List<SysDeptDTO>> list() {
-        List<SysDeptDTO> list = sysDeptService.list(new HashMap<>(1));
+    public Result<List<SysDeptDTO>> list(@RequestParam Map<String, Object> params) {
+        List<SysDeptDTO> list = sysDeptService.list(params);
 
         return new Result<List<SysDeptDTO>>().ok(list);
     }
diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
index 4a7b850..fc004ad 100644
--- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
+++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml
@@ -6,6 +6,9 @@
     <select id="getList" resultType="com.elink.esua.epdc.entity.SysDeptEntity">
         select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1
         where t1.del_flag = 0
+        <if test="areaCode != null and areaCode.trim() != ''">
+            and t1.area_code LIKE CONCAT( '%', #{areaCode}, '%' )
+        </if>
         <if test="deptIdList != null">
             and t1.id in
             <foreach item="id" collection="deptIdList" open="(" separator="," close=")">