java/zhihuishenqu.git

花城-智慧社区

parent: dd8aa15e | 补丁 | 提交 | ignore whitespace

101captain

2022-03-10 80cc48f1f4cfaad32336040ade03b82d6ea9685e

Merge branch 'hemenkou_dev' into dev

1个文件已修改

springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -617,7 +617,7 @@
                        .filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
            }
        }
        if(isNull(type)){
        if(!isNull(type)){
            comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
        }
        if (!comActActivityDOS.isEmpty()) {

			@@ -617,7 +617,7 @@
			.filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
			}
			}
			if(isNull(type)){
			if(!isNull(type)){
			comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
			}
			if (!comActActivityDOS.isEmpty()) {