From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 13 三月 2025 19:58:45 +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