From 1db950d7fc0e4d12424f93ddd78ebc28767ca9ba Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 20 五月 2021 17:08:28 +0800
Subject: [PATCH] bugfixed

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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 d58f703..3ec2052 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
@@ -5,8 +5,10 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.panzhihua.common.model.vos.IndexDataVO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.service.user.UserService;
 import com.panzhihua.service_community.dao.ComActActSignDAO;
 import com.panzhihua.service_community.dao.ComActActivityDAO;
 import com.panzhihua.service_community.dao.ComActDiscussOptionUserDAO;
@@ -40,6 +42,8 @@
     private ComActActivityDAO comActActivityDAO;
     @Resource
     private ComActActSignDAO comActActSignDAO;
+    @Resource
+    private UserService userService;
 
     /**
      * 新增社区活动
@@ -237,8 +241,16 @@
         Integer type = signactivityVO.getType();
         Long userId = signactivityVO.getUserId();
         Integer isVolunteer = signactivityVO.getIsVolunteer();
+
         int num=0;
         if (1==type) {
+            R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(String.valueOf(userId));
+            LoginUserInfoVO loginUserInfoVO = userInfoR.getData();
+            boolean userNotVolunteer = !(loginUserInfoVO.getIsVolunteer()==1);
+            if(isVolunteer == 1 && userNotVolunteer){
+                return R.fail("只有志愿者才能报名");
+            }
+
             ComActActSignDO comActActSignDO=new ComActActSignDO();
             comActActSignDO.setActivityId(activityId);
             comActActSignDO.setUserId(userId);

--
Gitblit v1.7.1