From d20cf2979502fd58c999d2dc7df12e554a31d3df Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 24 七月 2024 11:07:54 +0800
Subject: [PATCH] 花城 排行范围选择本单位,呈现出了该账号单位以外的其它单位信息   党员活动的时长计算有问题。

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index a082b0a..a1e1bdb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -747,7 +747,7 @@
         if(!isNull(type)){
             comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
         }
-        if (!comActActivityDOS.isEmpty()) {
+        if (comActActivityDOS != null  ) {
             comActActivityDOS.forEach(comActActivityDO -> {
                 ComActActivityVO comActActivityVO = new ComActActivityVO();
                 BeanUtils.copyProperties(comActActivityDO, comActActivityVO);

--
Gitblit v1.7.1