From 72c41a8bb4210d9c8f87be7b99ea7c180a5d40e9 Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期四, 24 二月 2022 16:08:12 +0800
Subject: [PATCH] 党支部统计接口

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java |    3 ++-
 1 files changed, 2 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 a17c5cc..0af732e 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
@@ -478,6 +478,7 @@
                 return R.fail("已经报名过了,请勿重复提交");
             }
             Integer volunteerMax = actActivityDO.getVolunteerMax();
+            Integer activityType = actActivityDO.getType();
             Integer residentMax = actActivityDO.getParticipantMax();
             R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(String.valueOf(userId));
             LoginUserInfoVO loginUserInfoVO =
@@ -485,7 +486,7 @@
             // 查询当前活动下参与居民
             Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                     .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
-            if (volunteerMax != 0) {
+            if (activityType.equals(2)) {
                 //志愿者活动
                 boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
                 // 查询当前活动下参与志愿者

--
Gitblit v1.7.1