|
@@ -144,18 +144,20 @@ public class RetrievalFacade {
|
|
|
}
|
|
|
}
|
|
|
//获取questionId
|
|
|
- QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
|
|
|
- questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
- .in("tag_name", questionNames)
|
|
|
- .eq("item_type", 0)
|
|
|
- .ne("tag_type", 8)
|
|
|
- .in("type", typeList);
|
|
|
- List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
|
|
|
- Map<String, QuestionInfo> questionInfoMap = questionInfoList.stream()
|
|
|
- .collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
|
|
|
- for (RetrievalDTO retrievalDTOInfo : retrievalDTOList.data) {
|
|
|
- if (null != questionInfoMap.get(retrievalDTOInfo.getName())) {//设置questionId
|
|
|
- retrievalDTOInfo.setQuestionId(questionInfoMap.get(retrievalDTOInfo.getName()).getId());
|
|
|
+ if (ListUtil.isNotEmpty(questionNames)){
|
|
|
+ QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
|
|
|
+ questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .in("tag_name", questionNames)
|
|
|
+ .eq("item_type", 0)
|
|
|
+ .ne("tag_type", 8)
|
|
|
+ .in("type", typeList);
|
|
|
+ List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
|
|
|
+ Map<String, QuestionInfo> questionInfoMap = questionInfoList.stream()
|
|
|
+ .collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
|
|
|
+ for (RetrievalDTO retrievalDTOInfo : retrievalDTOList.data) {
|
|
|
+ if (null != questionInfoMap.get(retrievalDTOInfo.getName())) {//设置questionId
|
|
|
+ retrievalDTOInfo.setQuestionId(questionInfoMap.get(retrievalDTOInfo.getName()).getId());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|