From 1a0c352156e7ac5074d3318a46fb58c2a9681e2f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 27 Aug 2020 14:18:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/screen/impl/PartyMemberLeadServiceImpl.java        | 2 +-
 .../src/main/resources/mapper/screen/ScreenEventDataDao.xml    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
index 79868496d1..c00487d080 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
@@ -158,7 +158,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
     public List<String> getXPro(){
         List<String> xAxis = new ArrayList<>();
         LocalDate today = LocalDate.now();
-        for(int i = NumConstant.TWELVE;i >= NumConstant.ONE; i--){
+        for(int i = NumConstant.ELEVEN;i >= NumConstant.ZERO; i--){
             LocalDate localDate = today.minusMonths(i);
             String s = localDate.getMonth().getValue() + ScreenConstant.MONTH;
             xAxis.add(s);
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
index 0b2e8698e2..a484d4549a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -6,7 +6,7 @@
     <!-- 查询事件 -->
     <select id="selectEvent" resultType="com.epmet.screen.dto.result.ProjectResultDTO">
         SELECT
-            event_title AS projectTitle,
+            IFNULL(event_title,'') AS projectTitle,
             event_level AS color,
             event_id AS projectId,
             org_name AS orgName,
@@ -17,6 +17,7 @@
         WHERE
             del_flag = '0'
             AND parent_id = #{parentId}
+            AND all_parent_ids LIKE concat('%', #{agencyId}, '%')
     </select>
 
     <!-- 项目详情 -->