From aa9d5899deda2c9a9c4da111e89509136f1c4ec2 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期五, 18 六月 2021 14:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 8 +++-----
1 files changed, 3 insertions(+), 5 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 bfed542..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
@@ -39,21 +39,19 @@
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Integer isPartymember = loginUserInfo.getIsPartymember();
Integer isVolunteer = loginUserInfo.getIsVolunteer();
- pageQuestnaireDTO.setForParty(1 == isPartymember);
- pageQuestnaireDTO.setForVolunteer(1 == isVolunteer);
+ 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