Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-09 4d74cda64ed8f82ce8744270a21f87dfe2da57c6

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java

@@ -183,7 +183,7 @@

    @Override
    public R infoQuestnaire(Long questId) {
        return null;
        return answerInfoQuestnaire(null, questId);
    }

    @Override
@@ -224,6 +224,7 @@
                    });
                    usersSubAnswerVO.setQuestSelectionList(comActQuestnaireSubSelectionVOs);
                    //用户回答
                    if(userId!=null) {
                    List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList =
                            questnaireAnswerContentDAO.selectList(new QueryWrapper<ComActQuestnaireAnswerContentDO>().lambda().eq(ComActQuestnaireAnswerContentDO::getUserId, userId)
                                    .eq(ComActQuestnaireAnswerContentDO::getSubId, subId));
@@ -236,6 +237,7 @@
                    });

                    usersSubAnswerVO.setUsersAnswer(questnaireAnswerContentVOList);
                    }
                    usersSubAnswerVOList.add(usersSubAnswerVO);
                }
        );