From 9a0974c8900b303ced704c663ee002cb25648752 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 14:07:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java |   17 +++++------------
 1 files changed, 5 insertions(+), 12 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 b43fc1b..f5bd491 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
@@ -151,17 +151,10 @@
 
     @Override
     public R deleteQuestnaire(Long queId) {
-        int queDeleteResult = questnaireDAO.deleteById(queId);
-        if (queDeleteResult > 0) {
-            LambdaQueryWrapper<ComActQuestnaireSubDO> subParam = new QueryWrapper<ComActQuestnaireSubDO>().lambda();
-            subParam.eq(ComActQuestnaireSubDO::getQueId, queId);
-            List<Long> subIds = questnaireSubDAO.selectList(subParam).stream().map(ComActQuestnaireSubDO::getId).collect(Collectors.toList());
-            int subDeleteResult = questnaireSubDAO.delete(subParam);
-            if (subDeleteResult > 0) {
-                LambdaQueryWrapper<ComActQuestnaireSubSelectionDO> subSelectParam = new LambdaQueryWrapper<ComActQuestnaireSubSelectionDO>().in(ComActQuestnaireSubSelectionDO::getQueSubId, subIds);
-                questnaireSubSelectionDAO.delete(subSelectParam);
-            }
-        }
+        LambdaQueryWrapper<ComActQuestnaireDO> subParam = new LambdaQueryWrapper<ComActQuestnaireDO>().eq(ComActQuestnaireDO::getId, queId);
+        ComActQuestnaireDO queDO = questnaireDAO.selectOne(subParam);
+        queDO.setIsHide(1);
+        questnaireDAO.updateById(queDO);
         return R.ok();
     }
 
@@ -172,7 +165,7 @@
 
     @Override
     public R infoQuestnaire(Long questId) {
-        return answerInfoQuestnaire(null, questId);
+        return null;
     }
 
     @Override

--
Gitblit v1.7.1