|
@@ -1,5 +1,6 @@
|
|
|
package com.zhongzheng.controller.bank;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.zhongzheng.common.core.controller.BaseController;
|
|
|
import com.zhongzheng.common.core.domain.AjaxResult;
|
|
|
import com.zhongzheng.common.core.page.TableDataInfo;
|
|
@@ -129,7 +130,7 @@ public class QuestionController extends BaseController {
|
|
|
if (!CollectionUtils.isEmpty(paperVos)){
|
|
|
Map<Long, List<ExamPaperVo>> map = paperVos.stream().collect(Collectors.groupingBy(ExamPaperVo::getGoodsId));
|
|
|
map.forEach((k,v) -> {
|
|
|
- ArrayList<ExamPaperVo> vos = v.stream().collect(Collectors.collectingAndThen(Collectors
|
|
|
+ ArrayList<ExamPaperVo> vos = v.stream().filter(x -> ObjectUtils.isNotNull(x.getPaperId())).collect(Collectors.collectingAndThen(Collectors
|
|
|
.toCollection(() -> new TreeSet<>(Comparator.comparing(item -> item.getPaperId()))), ArrayList::new));
|
|
|
map.put(k,vos);
|
|
|
});
|