From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 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