From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 fb0d6a1..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
@@ -27,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()+""));
}
/**
@@ -44,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));
}
/**
--
Gitblit v1.7.1