From 4abc2df5742c4cbeeb8adb6d6ffbb14c02efa4cb Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 08 十月 2021 17:35:11 +0800
Subject: [PATCH] 活动参与人群逻辑修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java |    4 +++-
 1 files changed, 3 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 e4b3bba..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));

--
Gitblit v1.7.1