From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java
index c3c9f98..07cfd25 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java
@@ -1,7 +1,9 @@
package com.panzhihua.service_community.api;
+import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerActivityVO;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.service.VolunteerActivityService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -12,7 +14,7 @@
@Slf4j
@RestController
@RequestMapping("/Volunteer")
-public class VolunteerActivityApi
+public class VolunteerActivityApi extends BaseController
{
@Resource
private VolunteerActivityService volunteerActivityService;
@@ -25,7 +27,7 @@
@GetMapping("/queryById")
public R queryById(@RequestParam("id") String id)
{
- return R.ok(volunteerActivityService.queryById(id));
+ return R.ok(volunteerActivityService.queryById(id,getUserId()+""));
}
/**
@@ -42,8 +44,16 @@
@RequestParam(value = "actityBeginTime", required = false) Date actityBeginTime,
@RequestParam(value = "actityEndTime", required = false) Date actityEndTime)
{
+ if(StringUtils.isEmpty(acState))
+ {
+ acState=null;
+ }
- return R.ok(volunteerActivityService.queryList(pageNum, pageSize, name, acState, acType, actityBeginTime, actityEndTime));
+ if(StringUtils.isEmpty(acType))
+ {
+ acType=null;
+ }
+ return R.ok(volunteerActivityService.queryList(pageNum, pageSize, name, acState, acType,getUserId()+"", actityBeginTime, actityEndTime));
}
/**
@@ -54,6 +64,10 @@
@PostMapping("/insertVolunteer")
R insertVolunteer(@RequestBody VolunteerActivityVO volunteerActivityVO)
{
+ if(StringUtils.isEmpty(volunteerActivityVO.getCommunityId()))
+ {
+ volunteerActivityVO.setCommunityId(getCommunityId()+"");
+ }
int num = volunteerActivityService.insertVolunteer(volunteerActivityVO);
if(num>0)
{
--
Gitblit v1.7.1