|
@@ -386,19 +386,27 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
//获取标签信息
|
|
//获取标签信息
|
|
- QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
|
|
|
|
- questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
|
- .in("id", questionIdList);
|
|
|
|
- List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
|
|
|
|
- Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream()
|
|
|
|
- .collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
|
|
|
|
|
|
+ Map<Long, QuestionInfo> questionInfoMap = new HashMap<>();
|
|
|
|
+ if (ListUtil.isNotEmpty(questionIdList)) {
|
|
|
|
+ QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
|
+ .in("id", questionIdList);
|
|
|
|
+ List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
|
|
|
|
+ questionInfoMap = questionInfoList.stream()
|
|
|
|
+ .collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
|
|
|
|
+ }
|
|
|
|
+
|
|
//获取模板信息
|
|
//获取模板信息
|
|
- QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
|
|
|
|
- questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
|
- .in("id", moduleIdList);
|
|
|
|
- List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
|
|
|
|
- Map<Long, ModuleInfo> moduleInfoMap = moduleInfoList.stream()
|
|
|
|
- .collect(Collectors.toMap(ModuleInfo::getId, moduleInfo -> moduleInfo));
|
|
|
|
|
|
+ Map<Long, ModuleInfo> moduleInfoMap = new HashMap<>();
|
|
|
|
+ if (ListUtil.isNotEmpty(moduleIdList)) {
|
|
|
|
+ QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
|
+ .in("id", moduleIdList);
|
|
|
|
+ List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
|
|
|
|
+ moduleInfoMap = moduleInfoList.stream()
|
|
|
|
+ .collect(Collectors.toMap(ModuleInfo::getId, moduleInfo -> moduleInfo));
|
|
|
|
+ }
|
|
|
|
+
|
|
//循环给出参赋值
|
|
//循环给出参赋值
|
|
for (ModuleDetail moduleDetail : moduleDetailList) {
|
|
for (ModuleDetail moduleDetail : moduleDetailList) {
|
|
getModuleDetailInfoDTO = new GetModuleDetailInfoDTO();
|
|
getModuleDetailInfoDTO = new GetModuleDetailInfoDTO();
|