From a9901efac9b34576b36409fe95ef8f0c8f7a4636 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 1 Jul 2020 16:19:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E3=80=91=E3=80=90=E8=BF=90=E8=90=A5=E5=B8=A6?=
 =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=E3=80=91-=E7=8E=8B=E5=85=AC?=
 =?UTF-8?q?=E5=B3=B0-2020-07-01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserAnalysisServiceImpl.java    | 16 ++++++++--------
 .../resources/mapper/user/UserAnalysisDao.xml    |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
index 6b0f4b007..79f3050ab 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
@@ -348,14 +348,14 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
                     exportOperationDataResultDTOS.get(i).setRegisterCount(exportOperationDataResultDTOS.get(i).getRegisterCount());
                 }
             }*/
-            exportOperationDataResultDTOS.get(i).setNewsCount(newsResultDTOS.get(i).getNewsCount());
-            exportOperationDataResultDTOS.get(i).setItemCount(itemDataResultDTOS.get(i).getItemCount());
-            exportOperationDataResultDTOS.get(i).setItemCloseCount(itemDataResultDTOS.get(i).getItemCloseCount());
-            exportOperationDataResultDTOS.get(i).setEventCount(eventDataResultDTOS.get(i).getEventCount());
-            exportOperationDataResultDTOS.get(i).setCommunityCount(groupDataResultDTOS.get(i).getCommunityCount());
-            exportOperationDataResultDTOS.get(i).setCommunityMemberCount(communityMemberDataResultDTOS.get(i).getCommunityMemberCount());
-            exportOperationDataResultDTOS.get(i).setCommunityTopicCount(topicDataResultDTOS.get(i).getCommunityTopicCount());
-            exportOperationDataResultDTOS.get(i).setEnterpriseCount(enterpriseDataResultDTOS.get(i).getEnterpriseCount());
+            exportOperationDataResultDTOS.get(i).setNewsCount(newsResultDTOS.size() == 0 ? 0 : newsResultDTOS.get(i).getNewsCount());
+            exportOperationDataResultDTOS.get(i).setItemCount(itemDataResultDTOS.size() == 0 ? 0 : itemDataResultDTOS.get(i).getItemCount());
+            exportOperationDataResultDTOS.get(i).setItemCloseCount(itemDataResultDTOS.size() == 0 ? 0 : itemDataResultDTOS.get(i).getItemCloseCount());
+            exportOperationDataResultDTOS.get(i).setEventCount(eventDataResultDTOS.size() == 0 ? 0 : eventDataResultDTOS.get(i).getEventCount());
+            exportOperationDataResultDTOS.get(i).setCommunityCount(groupDataResultDTOS.size() == 0 ? 0 : groupDataResultDTOS.get(i).getCommunityCount());
+            exportOperationDataResultDTOS.get(i).setCommunityMemberCount(communityMemberDataResultDTOS.size() == 0 ? 0 : communityMemberDataResultDTOS.get(i).getCommunityMemberCount());
+            exportOperationDataResultDTOS.get(i).setCommunityTopicCount(topicDataResultDTOS.size() == 0 ? 0 : topicDataResultDTOS.get(i).getCommunityTopicCount());
+            exportOperationDataResultDTOS.get(i).setEnterpriseCount(enterpriseDataResultDTOS.size() == 0 ? 0 : enterpriseDataResultDTOS.get(i).getEnterpriseCount());
 
         }
         return exportOperationDataResultDTOS;
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index b368a8158..2e1b4a80b 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -762,14 +762,14 @@
         <if test="endTime != null and endTime != ''">
             and DATE_FORMAT(un.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
         </if>
-        where
-        1=1
         <if test="deptIdList != null and deptIdList.size() > 0">
             AND un.DEPT_ID in
             <foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
                 #{deptId}
             </foreach>
         </if>
+        where
+        1=1
         GROUP BY
             t0.id
         ORDER BY