From 07e58222079a5ad2a148e353ec8f543512cde1fb Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Fri, 3 Apr 2020 17:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E7=AB=AF?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD=E6=85=A2?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/item/ItemDao.xml    | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index be8962b5..2990c3af 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -152,25 +152,40 @@
         LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID
         AND hp.DEL_FLAG = '0'
         AND hp.CREATED_TIME = ( SELECT MAX( a.CREATED_TIME ) FROM epdc_item_handle_process a WHERE a.DEL_FLAG = '0' AND a.ITEM_ID = hp.ITEM_ID )
-        LEFT JOIN epdc_item_dept dept ON item.Id = dept.ITEM_ID AND dept.DEL_FLAG = '0'
         WHERE
-        item.DEL_FLAG = '0'
-        <if test="formDto.timestamp != null">
-            <![CDATA[ AND DATE_FORMAT(item.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{formDto.timestamp}
-        </if>
-        AND dept.DEPT_ID IN
+        item.ID IN (
+        SELECT
+        tmp.ITEM_ID
+        FROM
+        (
+        SELECT DISTINCT
+        d.ITEM_ID
+        FROM
+        epdc_item_dept d
+        LEFT JOIN epdc_item it ON d.ITEM_ID = it.ID
+        WHERE
+        d.DEL_FLAG = '0'
+        AND it.DEL_FLAG = '0'
+        AND d.DEPT_ID IN
         <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
             #{deptIdItem}
         </foreach>
-        <if test='formDto.deptId != null and formDto.deptId != ""'>
-            AND dept.DEPT_ID = #{formDto.deptId}
+        <if test="formDto.timestamp != null">
+            <![CDATA[ AND DATE_FORMAT(it.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{formDto.timestamp}
         </if>
         <if test='formDto.itemState != null '>
-            AND item.ITEM_STATE = #{formDto.itemState}
+            AND it.ITEM_STATE = #{formDto.itemState}
+        </if>
+        <if test='formDto.deptId != null and formDto.deptId != ""'>
+            AND d.DEPT_ID = #{formDto.deptId}
         </if>
         ORDER BY
-        item.CREATED_TIME DESC
+        it.CREATED_TIME DESC
         LIMIT #{formDto.pageIndex},#{formDto.pageSize}
+        ) tmp
+        )
+        ORDER BY
+        item.CREATED_TIME DESC
     </select>
 
     <select id="selectListItemsOfMine" resultMap="itemsMap">