From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 a024663..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
@@ -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,getUserId()+"", 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