From 1fb43303f1350c586ee6a543960a96ac4ac8786e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 14:05:16 +0800
Subject: [PATCH] add: 用户问卷答题查看

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
index 8f69813..b43fc1b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -172,7 +172,7 @@
 
     @Override
     public R infoQuestnaire(Long questId) {
-        return null;
+        return answerInfoQuestnaire(null, questId);
     }
 
     @Override
@@ -213,18 +213,20 @@
                     });
                     usersSubAnswerVO.setQuestSelectionList(comActQuestnaireSubSelectionVOs);
                     //用户回答
-                    List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList =
-                            questnaireAnswerContentDAO.selectList(new QueryWrapper<ComActQuestnaireAnswerContentDO>().lambda().eq(ComActQuestnaireAnswerContentDO::getUserId, userId)
-                                    .eq(ComActQuestnaireAnswerContentDO::getSubId, subId));
+                    if(userId!=null) {
+                        List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList =
+                                questnaireAnswerContentDAO.selectList(new QueryWrapper<ComActQuestnaireAnswerContentDO>().lambda().eq(ComActQuestnaireAnswerContentDO::getUserId, userId)
+                                        .eq(ComActQuestnaireAnswerContentDO::getSubId, subId));
 
-                    List<ComActQuestnaireAnswerContentVO> questnaireAnswerContentVOList = new ArrayList<>();
-                    questnaireAnswerContentDOList.forEach(questnaireAnswerContentDO->{
-                        ComActQuestnaireAnswerContentVO comActQuestnaireSubSelectionVO = new ComActQuestnaireAnswerContentVO();
-                        BeanUtils.copyProperties(questnaireAnswerContentDO, comActQuestnaireSubSelectionVO);
-                        questnaireAnswerContentVOList.add(comActQuestnaireSubSelectionVO);
-                    });
+                        List<ComActQuestnaireAnswerContentVO> questnaireAnswerContentVOList = new ArrayList<>();
+                        questnaireAnswerContentDOList.forEach(questnaireAnswerContentDO -> {
+                            ComActQuestnaireAnswerContentVO comActQuestnaireSubSelectionVO = new ComActQuestnaireAnswerContentVO();
+                            BeanUtils.copyProperties(questnaireAnswerContentDO, comActQuestnaireSubSelectionVO);
+                            questnaireAnswerContentVOList.add(comActQuestnaireSubSelectionVO);
+                        });
 
-                    usersSubAnswerVO.setUsersAnswer(questnaireAnswerContentVOList);
+                        usersSubAnswerVO.setUsersAnswer(questnaireAnswerContentVOList);
+                    }
                     usersSubAnswerVOList.add(usersSubAnswerVO);
                 }
         );

--
Gitblit v1.7.1