From 52fd0d3834951305f7dd3e6f9370d319f1c80352 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 27 五月 2024 09:36:36 +0800 Subject: [PATCH] 添加用户使用List接收deptIds --- src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java index b33c030..8eb7a39 100644 --- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java +++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java @@ -637,7 +637,10 @@ @Override public List<ExamPaper> list(List<Integer> deptIds) { - return examPaperMapper.list(deptIds); + List<ExamPaper> list = examPaperMapper.list(deptIds); + List<ExamPaper> template = examPaperMapper.template(deptIds); + list.addAll(template); + return list.stream().sorted(Comparator.comparing(ExamPaper::getCreateTime).reversed()).collect(Collectors.toList()); } @Override -- Gitblit v1.8.0