From ff37f2fed3c479e5c664e5bff0834e37f400eceb Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 四月 2021 09:22:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 2093f1d..e770468 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1346,7 +1346,13 @@
*/
@PostMapping("questnaire/pagequestnaire")
public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO,@RequestParam("communityId") Long communityId) {
- return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO,communityId);
+ if(pageQuestnaireDTO.getForParty()==null){
+ pageQuestnaireDTO.setForParty(false);
+ }
+ if(pageQuestnaireDTO.getForVolunteer()==null){
+ pageQuestnaireDTO.setForVolunteer(false);
+ }
+ return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO, communityId);
}
/**
--
Gitblit v1.7.1