From 3f5e3c665ae68f939f908c0b9267a35e71301317 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 13 Apr 2021 14:14:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?dev=E5=88=86=E6=94=AF=E5=90=88=E5=88=B0dev?=
 =?UTF-8?q?=5Fadd=5Fcustomer=5Fid=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
index ff37731933..187eaee664 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@@ -409,7 +409,6 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
                                 IssueVoteStatisticalEntity.class);
                         insertBatch(issueVoteStatisticalEntityList);
                     }
-                    baseDao.insertBatch(toInsert);
                 }
            //}
          //else if (ids.size() < statisiticalIds.size()) {

From c50c132dcf8568d46d8adfd7b5b87aa19d9272e7 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 14 Apr 2021 17:24:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9-?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=20=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=BA=E7=A9=BA=E5=88=99=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/project/ProjectDao.xml          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 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
index 2b9fba6e2d..d06d7ac03d 100644
--- 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,
@@ -275,4 +275,4 @@
 		WHERE EVENT_ID = #{eventId}
 		ORDER BY SORT
     </select>
-</mapper>
\ No newline at end of file
+</mapper>