From 97b65c091d4ffecf1fcd829e87fda5a570e18661 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 23 Aug 2022 17:37:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8A=E6=8A=A5=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/item/form/PeopleItemFormDTO.java |  5 ++++
 .../main/resources/mapper/item/ItemDao.xml    | 26 ++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java
index c1416566f..35dfbc1d2 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java
@@ -19,6 +19,11 @@ public class PeopleItemFormDTO implements Serializable {
      */
     private String userId;
 
+    /**
+     * 时间戳
+     */
+    private String timestamp;
+
     /**
      * 搜索内容
      */
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 cc631ab81..61c5c1a3d 100755
--- 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
@@ -1186,6 +1186,7 @@
             and t.FIRST_CATEGORY_CODE!=t.category_code
     </select>
     <select id="getItemListByUserId" resultMap="itemsMap">
+
         SELECT
         item.ID,
         item.EVENT_ID,
@@ -1232,31 +1233,26 @@
         FROM
         epdc_item t1
         WHERE t1.DEL_FLAG = '0'
-        <if test="formDto.timestamp != null">
-            <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{formDto.timestamp}
+        <if test="timestamp != null">
+            <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
-        <if test='formDto.searchContent != null and formDto.searchContent != ""'>
-            AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%')
+        <if test='searchContent != null and searchContent != ""'>
+            AND t1.ITEM_CONTENT LIKE CONCAT('%',#{searchContent},'%')
         </if>
-        <if test='formDto.userId != null and formDto.userId != ""'>
-            AND t1.USER_ID = #{formDto.userId}
+        <if test='userId != null and userId != ""'>
+            AND t1.USER_ID = #{userId}
         </if>
-        <if test='formDto.peopleFlag != null and formDto.peopleFlag != ""'>
-            AND t1.PEOPLE_FLAG = #{formDto.peopleFlag}
+        <if test='peopleFlag != null and peopleFlag != ""'>
+            AND t1.PEOPLE_FLAG = #{peopleFlag}
         </if>
         ORDER BY
-        <if test='formDto.orderType != null and formDto.orderType != "" and formDto.orderType == "1"'>
-            t1.LAST_HANDLE_TIME DESC
-        </if>
         t1.CREATED_TIME DESC
-        LIMIT #{formDto.pageIndex},#{formDto.pageSize}
+        LIMIT #{pageIndex},#{pageSize}
         ) temp
         )
         ORDER BY
-        <if test='formDto.orderType != null and formDto.orderType != "" and formDto.orderType == "1"'>
-            item.LAST_HANDLE_TIME DESC
-        </if>
         item.CREATED_TIME DESC,
         img.IMG_URL
+
     </select>
 </mapper>