From 4c93d581de8323667e08bcb00dac88762a49e183 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 12 五月 2021 10:04:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
index ba18d57..cff8961 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
@@ -42,18 +42,16 @@
pageQuestnaireDTO.setForParty(1 == isPartymember.intValue());
pageQuestnaireDTO.setForVolunteer(1 == isVolunteer.intValue());
pageQuestnaireDTO.setUserId(loginUserInfo.getUserId());
-// pageQuestnaireDTO.setState(0);
return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
}
@ApiOperation(value = "分页查询社区调查问卷", response = QuestnaireListVo.class)
@PostMapping("/pageVolunteer")
public R pageVolunteer(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
pageQuestnaireDTO.setForMasses(null);
pageQuestnaireDTO.setForVolunteer(true);
pageQuestnaireDTO.setForParty(true);
- return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
+ return communityService.pageQuestnaire(pageQuestnaireDTO, getLoginUserInfo().getCommunityId());
}
@ApiOperation(value = "创建调查问卷")
--
Gitblit v1.7.1