From 152549be26f0d719a3efb0970e115242421dad5f Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 22 May 2020 11:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8BBug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerStaffDepartmentDao.xml   | 3 +--
 .../src/main/resources/mapper/StaffRoleDao.xml                 | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
index 254cbc4ab2..927d919372 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
@@ -22,8 +22,7 @@
             customer_staff_department
         WHERE
             del_flag = '0'
-        AND
-        <foreach item="departmentId" collection="deptIdList" open="(" separator="or" close=")">
+        <foreach item="departmentId" collection="deptIdList" open="AND (" separator="or" close=")">
             department_id = #{departmentId}
         </foreach>
     </select>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
index e7a2ce2fa9..c6402ed3b8 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
@@ -114,8 +114,7 @@
         WHERE
             sr.del_flag = '0'
         AND gsr.del_flag = '0'
-        AND
-        <foreach item="staffId" collection="staffIdList" separator="or" open="(" close=")" index="">
+        <foreach item="staffId" collection="staffIdList" separator="or" open="AND (" close=")" index="">
             sr.staff_id = #{staffId}
         </foreach>
     </select>