From 7564ef74fc34e12f1bded6576438ed7e4028b9ab Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 27 Aug 2021 16:36:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E6=94=B6=E5=88=B0=E7=9A=84sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/epmetmessage/InfoProfileDao.xml         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoProfileDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoProfileDao.xml
index 8c31bdcbb8..f93f3198d7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoProfileDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoProfileDao.xml
@@ -75,9 +75,9 @@
         SELECT
             ir.INFO_ID,
             ip.content,
-            ii.CREATED_TIME,
+            ip.CREATED_TIME,
             ir.READ_FLAG,
-            ii.publish_staff_id,
+            ip.publish_staff_id,
             ip.first_att_id,
             ia.ATTACHMENT_NAME AS name,
             ia.ATTACHMENT_FORMAT AS format,
@@ -91,18 +91,20 @@
             end) as duration
         FROM
             info_receivers ir
-            INNER JOIN info ii ON ( ir.INFO_ID = ii.ID )
-            INNER JOIN info_profile ip ON ( ii.ID = ip.INFO_ID AND ip.DEL_FLAG = '0' )
+            <if test="null != content and content !=''">
+                INNER JOIN info ii ON ( ir.INFO_ID = ii.ID )
+            </if>
+            INNER JOIN info_profile ip ON ( ir.INFO_ID = ip.INFO_ID AND ip.DEL_FLAG = '0' )
             LEFT JOIN info_att ia on ( ip.first_att_id = ia.id AND ia.DEL_FLAG = '0' )
         WHERE
             ir.DEL_FLAG = '0'
-          AND ii.DEL_FLAG = '0'
           AND ir.STAFF_ID = #{userId}
           <if test="null != content and content !=''">
+            AND ii.DEL_FLAG = '0'
             and ii.content like concat('%',trim(#{content}),'%')
           </if>
         ORDER BY
-            ii.CREATED_TIME DESC
+            ip.CREATED_TIME DESC
     </select>
 
     <select id="selectInfoDetail" parameterType="java.lang.String" resultType="com.epmet.dataaggre.dto.message.result.InfoDetailResDTO">