From a2d0c16e871c91e63c7c223b1b215099c6185f01 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 15 Jun 2020 18:33:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=B6=85=E6=97=B6=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E8=B6=85=E6=97=B6=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E9=AD=8F=E5=87=AF=EF=BC=89-2020/06/15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/item/ItemTimeoutDao.xml  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemTimeoutDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemTimeoutDao.xml
index 7e5d2b71c..5f4cfb086 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemTimeoutDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemTimeoutDao.xml
@@ -67,7 +67,7 @@
         WHERE
         a.DEL_FLAG = '0'
         <if test="itemState != null and itemState != ''">
-            AND a.ITEM_STATE = #{itemState}
+            AND item.ITEM_STATE = #{itemState}
         </if>
         <if test="associatedType != null and associatedType != ''">
             AND a.ITEM_STATE in (0,10)
@@ -75,22 +75,22 @@
         <if test="keyword != null and keyword != ''">
             AND a.ITEM_CONTENT like concat('%', trim(#{keyword}), '%')
         </if>
-<!--        AND a.ID IN (-->
-<!--        SELECT-->
-<!--        temp.ITEM_ID-->
-<!--        FROM-->
-<!--        ( SELECT dept.ITEM_ID FROM epdc_item_dept dept WHERE dept.DEL_FLAG = '0'-->
-<!--        <if test="deptIdList != null">-->
-<!--            AND dept.DEPT_ID IN-->
-<!--            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">-->
-<!--                #{deptId}-->
-<!--            </foreach>-->
-<!--        </if>-->
-<!--        <if test="districtDeptId != null and districtDeptId != ''">-->
-<!--            AND dept.DEPT_ID = #{districtDeptId}-->
-<!--        </if>-->
-<!--        ) temp-->
-<!--        )-->
+        AND a.ID IN (
+        SELECT
+        temp.ITEM_ID
+        FROM
+        ( SELECT dept.ITEM_ID FROM epdc_item_dept dept WHERE dept.DEL_FLAG = '0'
+        <if test="deptIdList != null">
+            AND dept.DEPT_ID IN
+            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
+        <if test="districtDeptId != null and districtDeptId != ''">
+            AND dept.DEPT_ID = #{districtDeptId}
+        </if>
+        ) temp
+        )
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( a.ITEM_CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>