Merge remote-tracking branch 'origin/master'

CeDo

2021-04-27 d2fe6196f1991d10b48adf2debf8521b34f4c461

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java

@@ -39,10 +39,10 @@
        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);
//        pageQuestnaireDTO.setState(0);
        return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
    }