|
@@ -407,6 +407,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
|
|
|
List<ExamApplyGoodsVo> examApplyGoodsVoList = iExamApplyGoodsService.listByGoodsId(goodsUserVo.getGoodsId());
|
|
|
if (examApplyGoodsVoList != null && examApplyGoodsVoList.size() > 0) {
|
|
|
List<ExamApplyGoodsVo> examApplyGoodsVos = new ArrayList<>();
|
|
|
+ List<ExamApplyGoodsVo> examApplyGoodsVos2 = new ArrayList<>();
|
|
|
examApplyGoodsVoList.forEach(examApplyGoodsVo -> {
|
|
|
LambdaQueryWrapper<ExamApplyUser> lqw = Wrappers.lambdaQuery();
|
|
|
lqw.eq(ExamApplyUser::getApplyId, examApplyGoodsVo.getApplyId());
|
|
@@ -419,6 +420,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
|
|
|
if (userIds.contains(bo.getUserId())) {
|
|
|
examApplyGoodsVos.add(examApplyGoodsVo);
|
|
|
}
|
|
|
+ }else {
|
|
|
+ examApplyGoodsVos2.add(examApplyGoodsVo);
|
|
|
}
|
|
|
LambdaQueryWrapper<ExamBeforeApply> lq = Wrappers.lambdaQuery();
|
|
|
lq.eq(ExamBeforeApply::getApplyId, examApplyGoodsVo.getApplyId());
|
|
@@ -436,6 +439,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
+ examApplyGoodsVos.addAll(examApplyGoodsVos2);
|
|
|
goodsUserVo.setExamApplyGoodsList(examApplyGoodsVos);
|
|
|
}
|
|
|
}
|