fix:bug

1.评卷参数设置列表查询 -> 加上命题任务和印刷计划表的考试id对应关系
2.机构树查询，调用公用查询用户权限发放返回值由null -> 空数组
3.试卷批量下载，根据曝光类型显示日志信息
4.教学班级管理 教学名称改为全校唯一

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachClazzServiceImpl.java

@@ -87,8 +87,7 @@ public class TeachClazzServiceImpl extends ServiceImpl<TeachClazzMapper,TeachCla
             TeachClazz check = this.getOne(new QueryWrapper<TeachClazz>()
                     .lambda()
                     .eq(TeachClazz::getSchoolId, schoolId)
-                    .eq(TeachClazz::getTeachClazzName, teachClazzName)
-                    .eq(TeachClazz::getTeachCourseId, teachCourseId));
+                    .eq(TeachClazz::getTeachClazzName, teachClazzName));
 
             if (Objects.nonNull(check)) {
                 throw ExceptionResultEnum.ERROR.exception("教学课程【" + basicCourseService.getById(teachCourseService.getById(check.getTeachCourseId()).getBasicCourseId()).getName()

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -1644,6 +1644,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     @Override
     public Map<String, Object> executeDownloadPaperFileBatch(Map<String, Object> map) throws Exception {
         TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
+        String specialSuccessMessage = "";
         DownloadPaperFileParam downloadPaperFileParam = (DownloadPaperFileParam) map.get("downloadPaperFileParam");
         Long schoolId = tbTask.getSchoolId();
         Long semesterId = downloadPaperFileParam.getSemesterId();
@@ -1691,37 +1692,17 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         InputStream in = new ByteArrayInputStream(outputStream.toByteArray());
 
         String excelName = "试卷使用清单";
+        if (Objects.nonNull(paperFileDownloadExposureStatus)){
+            excelName = excelName + paperFileDownloadExposureStatus.getDesc();
+        }
+        String excelLocalPath = zipLocalRootPath + File.separator + excelName + "." + SystemConstant.XLSX;
+        convertUtil.saveLocal(in,excelLocalPath);
 
         // 所有试卷信息
         List<ExamTaskPaperFileDto> examTaskPaperFileDtoList = examTaskPaperDto.getExamTaskPaperFileDtoList();
         if (examTaskPaperFileDtoList.size() == 0){
             throw ExceptionResultEnum.ERROR.exception("没有找到任何试卷信息");
         }
-        String specialSuccessMessage = "";
-        if (Objects.nonNull(paperFileDownloadExposureStatus)){
-            switch (paperFileDownloadExposureStatus) {
-                case EXPOSED_PAPER: // 曝光的
-                    excelName = excelName + "(" + paperFileDownloadExposureStatus.getDesc() + ")";
-                    examTaskPaperFileDtoList = examTaskPaperFileDtoList.stream().filter(ExamTaskPaperFileDto::getExposureStatus).collect(Collectors.toList());
-                    if (examTaskPaperFileDtoList.size() == 0){
-                        specialSuccessMessage = "所选择的命题任务中没有已曝光的试卷";
-                    }
-                    break;
-                case UNEXPOSED_PAPER: // 未曝光的
-                    excelName = excelName + "(" + paperFileDownloadExposureStatus.getDesc() + ")";
-                    examTaskPaperFileDtoList = examTaskPaperFileDtoList.stream().filter(e -> !e.getExposureStatus()).collect(Collectors.toList());
-                    if (examTaskPaperFileDtoList.size() == 0){
-                        specialSuccessMessage = "所选择的命题任务中没有未曝光的试卷";
-                    }
-                    break;
-                case ALL_PAPER: // 全部试卷
-                    excelName = excelName + "(" + paperFileDownloadExposureStatus.getDesc() + ")";
-                    break;
-            }
-        }
-        String excelLocalPath = zipLocalRootPath + File.separator + excelName + "." + SystemConstant.XLSX;
-        convertUtil.saveLocal(in,excelLocalPath);
-
         // 二级路径 课程
         Set<String> courseSet = examTaskPaperFileDtoList.stream().map(e -> e.getCourseName() + "-" + e.getCourseCode()).collect(Collectors.toSet());
         for (String course : courseSet) {
@@ -1768,6 +1749,26 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 String cardLocalHtmlPath = filePath + cardName + SystemConstant.HTML_PREFIX;
                 String cardLocalPdfPath = filePath + cardName + SystemConstant.PDF_PREFIX;
 
+                // 试卷文件曝光度筛选
+                if (Objects.nonNull(paperFileDownloadExposureStatus)){
+                    switch (paperFileDownloadExposureStatus) {
+                        case EXPOSED_PAPER: // 曝光的
+                            paperCellList = paperCellList.stream().filter(ExamTaskPaperFileDto::getExposureStatus).collect(Collectors.toList());
+                            if (paperCellList.size() == 0){
+                                specialSuccessMessage = "所选择的命题任务中没有已曝光的试卷";
+                            }
+                            break;
+                        case UNEXPOSED_PAPER: // 未曝光的
+                            paperCellList = paperCellList.stream().filter(e -> !e.getExposureStatus()).collect(Collectors.toList());
+                            if (paperCellList.size() == 0){
+                                specialSuccessMessage = "所选择的命题任务中没有未曝光的试卷";
+                            }
+                            break;
+                        case ALL_PAPER: // 全部试卷
+                            break;
+                    }
+                }
+
                 if (Objects.isNull(paperFileDownloadContent)){
                     continue;
                 }

distributed-print-business/src/main/resources/mapper/ExamPaperStructureMapper.xml

@@ -41,6 +41,7 @@
             LEFT JOIN exam_detail_course b ON a.id = b.exam_detail_id) edc ON epp.id = edc.print_plan_id
                 LEFT JOIN
             exam_task et ON edc.school_id = et.school_id
+                AND et.exam_id = epp.exam_id
                 AND edc.paper_number = et.paper_number
                 AND edc.course_code = et.course_code
                 LEFT JOIN

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysRoleServiceImpl.java

@@ -250,7 +250,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(SysUserRole::getUserId, userId);
         List<SysUserRole> sysUserRoles = sysUserRoleService.list(queryWrapper);
-        List<Long> list = null;
+        List<Long> list = new ArrayList<>();
         if (sysUserRoles != null && sysUserRoles.size() > 0) {
             list = sysUserRoles.stream().map(m -> m.getRoleId()).collect(Collectors.toList());
         }