根据标签id获取标签内容

icss-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -4,7 +4,6 @@ import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.QuestionDetail;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.wrapper.QuestionInfoWrapper;
-import com.diagbot.enums.ControlTypeEnum;
 import com.diagbot.service.impl.QuestionInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
@@ -48,10 +47,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         BeanUtil.copyProperties(questionInfo, res);
 
         //获取明细项
-        if(ControlTypeEnum.EMPTY_TAG.getKey() != res.getControlType()) { //不为空标签
-            List<QuestionDetail> questionDetailList = questionDetailFacade.getByQuestionId(questionVO.getId());
-            res.setQuestionDetailList(questionDetailList);
-        }
+        List<QuestionDetail> questionDetailList = questionDetailFacade.getByQuestionId(questionVO.getId());
+        res.setQuestionDetailList(questionDetailList);
 
         //获取子标签
         List<QuestionInfoWrapper> questionMapping = this.getByQuestionMapping(paramMap);
@@ -64,8 +61,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             paramMap1.put("age", questionVO.getAge());
 
             for(QuestionDTO bean : sonQuestionList) {
-                List<QuestionDetail> questionDetailList = questionDetailFacade.getByQuestionId(bean.getId());
-                bean.setQuestionDetailList(questionDetailList);
+                List<QuestionDetail> questionDetailList1 = questionDetailFacade.getByQuestionId(bean.getId());
+                bean.setQuestionDetailList(questionDetailList1);
                 paramMap1.put("id", bean.getId());
                 //获取第二级子标签
                 List<QuestionInfoWrapper> questionMapping1 = this.getByQuestionMapping(paramMap1);
@@ -73,11 +70,9 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 bean.setQuestionMapping(sonQuestionList1);
 
                 for(QuestionDTO questionDTO : sonQuestionList1) {
-                    //获取明细项
-                    if(ControlTypeEnum.EMPTY_TAG.getKey() != questionDTO.getControlType()) { //不为空标签
-                        List<QuestionDetail> questionDetailList1 = questionDetailFacade.getByQuestionId(questionDTO.getId());
-                        questionDTO.setQuestionDetailList(questionDetailList1);
-                    }
+                    //获取二级子明细项
+                    List<QuestionDetail> questionDetailList2 = questionDetailFacade.getByQuestionId(questionDTO.getId());
+                    questionDTO.setQuestionDetailList(questionDetailList2);
                 }
 
             }