From 133db38da4ddca31dcdd559df626d351851ca88f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 19 Nov 2020 14:24:10 +0800
Subject: [PATCH] =?UTF-8?q?selectListByIssueApplicationId=20sql=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/IssueApplicationHistoryDao.xml      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml
index e3bc84fc2a..cee15d1297 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml
@@ -5,18 +5,18 @@
     <!--   根据issue_application.id查询审核历史 -->
     <select id="selectListByIssueApplicationId" resultType="com.epmet.dto.result.ApplicationHistoryResDTO">
         SELECT
-            iah.ID as historyId,
-            iah.ACTION_TYPE,
-            unix_timestamp( iah.CREATED_TIME ) AS operateTime,
-            iah.REASON,
-            iah.STAFF_NAME
+                iah.ID as historyId,
+                iah.ACTION_TYPE,
+                unix_timestamp( iah.CREATED_TIME ) AS operateTime,
+                IFNULL(iah.REASON,'')AS REASON,
+                IFNULL(iah.STAFF_NAME,'')as STAFF_NAME
         FROM
-            issue_application_history iah
+                issue_application_history iah
         WHERE
-            iah.DEL_FLAG = '0'
-            AND iah.ISSUE_APPLICATION_ID = #{issueApplicationId}
+                iah.DEL_FLAG = '0'
+                AND iah.ISSUE_APPLICATION_ID = #{issueApplicationId}
         ORDER BY
-            iah.CREATED_TIME DESC
+                iah.CREATED_TIME DESC
     </select>
 
 </mapper>
\ No newline at end of file