Merge remote-tracking branch 'remotes/origin/dev'

5 years ago · b7056f638b
1 changed files with 2 additions and 2 deletions
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
@ -238,7 +238,7 @@
    <select id="difficultyRank" resultType="com.epmet.project.dto.result.ProjectDifficultRankResultDTO">
         SELECT
            diff.EVENT_ID AS projectId,
-            diff.EVENT_CONTENT AS title,
+            ifnull(diff.EVENT_CONTENT,diff.EVENT_TITLE) AS title,
            diff.EVENT_STATUS_CODE AS statusCode,
            diff.EVENT_SOURCE AS gridName,
            diff.EVENT_IMG_URL AS imgUrl,