From 05a54025b1ae843f9d21a4450ec05c9e420e7f24 Mon Sep 17 00:00:00 2001 From: zf <1603559716@qq.com> Date: 星期四, 28 九月 2023 10:47:37 +0800 Subject: [PATCH] bug修改 --- exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java index 5eb58e2..56459e9 100644 --- a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java +++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java @@ -215,12 +215,13 @@ @Override - public List<GetExaminerRespDTO> selectAll() { + public List<GetExaminerRespDTO> selectAll(Integer isCm) { LambdaQueryWrapper<ExaminerManage> wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ExaminerManage::getDelFlag,DeleteStatusEnum.NO.getStatus()); + wrapper.eq(ExaminerManage::getDelFlag,DeleteStatusEnum.NO.getStatus()) + .eq(ExaminerManage::getIsCm,isCm); List<ExaminerManage> list = examinerManageService.list(wrapper); if (CollectionUtils.isEmpty(list)) - return null; + return new ArrayList<>(); List<GetExaminerRespDTO> dtos = new ArrayList<>(); for (ExaminerManage manage : list) { GetExaminerRespDTO dto = getExaminerRespDTO(manage); @@ -340,12 +341,13 @@ } @Override - public List<GetTeacherRespDTO> selectTeacherAll() { + public List<GetTeacherRespDTO> selectTeacherAll(Integer isCm) { LambdaQueryWrapper<TeacherManage> wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(TeacherManage::getDelFlag,DeleteStatusEnum.NO.getStatus()); + wrapper.eq(TeacherManage::getDelFlag,DeleteStatusEnum.NO.getStatus()) + .eq(TeacherManage::getIsCm,isCm); List<TeacherManage> list = teacherManageService.list(wrapper); if (CollectionUtils.isEmpty(list)) - return null; + return new ArrayList<>(); List<GetTeacherRespDTO> dtos = new ArrayList<>(); for (TeacherManage manage : list) { GetTeacherRespDTO dto = getTeacherRespDTO(manage); -- Gitblit v1.9.2