From 584431221914d207c011755d0e325c0e59c997d6 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 06 七月 2022 17:52:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index d9a59c4..21ccfd0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -1073,12 +1073,24 @@
Integer memberServiceCount=0;
Integer memberServiceTotalTome=0;
for (UnitActivityAnalysisVO vo : unitActivityAnalysisVOS) {
- unitServiceCount+=vo.getServiceTime();
- unitServiceTotalTime+=vo.getServiceTimes();
+ if (ObjectUtils.isNotEmpty(vo)){
+ if (ObjectUtils.isNotEmpty(vo.getServiceTime())){
+ unitServiceCount+=vo.getServiceTime();
+ }
+ if (ObjectUtils.isNotEmpty(vo.getServiceTimes())){
+ unitServiceTotalTime+=vo.getServiceTimes();
+ }
+ }
}
for (PartyMemberAnalysisVO vo : partyMemberAnalysisVOS) {
- memberServiceCount+=vo.getServiceTime();
- memberServiceTotalTome+=vo.getServiceTimes();
+ if (ObjectUtils.isNotEmpty(vo)){
+ if (ObjectUtils.isNotEmpty(vo.getServiceTime())){
+ memberServiceCount+=vo.getServiceTime();
+ }
+ if (ObjectUtils.isNotEmpty(vo.getServiceTimes())){
+ memberServiceTotalTome+=vo.getServiceTimes();
+ }
+ }
}
activityVO.setUnitServiceTotalCount(unitServiceCount);
activityVO.setUnitServiceTotalTime(unitServiceTotalTime);
--
Gitblit v1.7.1