From 78d1c9ee9b0c49f77c29d0535cb93c6d62c42f3a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 13:58:25 +0800
Subject: [PATCH] 1111修改提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 5673d1d..e3eb9f9 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
@@ -458,7 +458,9 @@
             String attendPeople = actActivityDO.getAattendPeople();
             if (isVolunteer.intValue() == 0 && isNotBlank(attendPeople)) {
                 if (isBlank(currentUserTags)) {
-                    return R.fail("您不是指定参与人群!");
+                    currentUserTags = "全部居民";
+                } else {
+                    currentUserTags = currentUserTags.concat(",全部居民");
                 }
                 List<String> currentUserTagList = Arrays.asList(currentUserTags.split(","));
                 boolean checkResult = currentUserTagList.stream().anyMatch(currentUserTag -> attendPeople.contains(currentUserTag));
@@ -729,7 +731,7 @@
         // 查询所有即将开始的活动
         List<ComActActivityDO> actActivityList = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>()
             .lambda().le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(), 1))
-            .ge(ComActActivityDO::getBeginAt, new Date()));
+            .ge(ComActActivityDO::getBeginAt, new Date()).notIn(ComActActivityDO::getStatus,5,6));
         if (!actActivityList.isEmpty()) {
             WxXCXTempSend util = new WxXCXTempSend();
             try {

--
Gitblit v1.7.1