From e43fd10c1a51be5809c361c24a2be138837b02b2 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 07 七月 2022 09:33:35 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 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 9e82f88..3d4a3b0 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,26 @@
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