|
@@ -767,7 +767,7 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
|
|
|
JSONObject answerDetail = findJsonObject(answerDetails, paperDetail.getIntValue("number"));
|
|
|
//按条件过滤需要的小题同时合并答案
|
|
|
JSONArray questionCollection = filterQuestions(paperDetail.getJSONArray("questions"),
|
|
|
- Objects.nonNull(answerDetail) ? answerDetail.getJSONArray("questions") : null, true,
|
|
|
+ Objects.nonNull(answerDetail) ? answerDetail.getJSONArray("questions") : null, false,
|
|
|
true);
|
|
|
//有小题的情况下,本大题才需要被包含
|
|
|
if (questionCollection.size() > 0) {
|