3.2.0-bug

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

@@ -345,7 +345,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             queryWrapper.lambda().in(ExamDetail::getPrintPlanId, printPlanIdList);
         }
         List<ExamDetail> examDetail = this.list(queryWrapper);
-        return examDetail.stream().map(ExamDetail::getExamPlace).distinct().collect(Collectors.toList());
+        return examDetail.stream().filter(m -> StringUtils.isNotBlank(m.getExamPlace())).map(ExamDetail::getExamPlace).distinct().collect(Collectors.toList());
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -362,7 +362,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             queryWrapper.lambda().in(ExamDetail::getPrintPlanId, printPlanIdList);
         }
         List<ExamDetail> examDetail = this.list(queryWrapper);
-        return examDetail.stream().map(ExamDetail::getExamRoom).distinct().collect(Collectors.toList());
+        return examDetail.stream().filter(m -> StringUtils.isNotBlank(m.getExamRoom())).map(ExamDetail::getExamRoom).distinct().collect(Collectors.toList());
     }
 
     @Transactional
@@ -673,7 +673,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
         // 更新基础学生表和附加数据
         basicStudentService.saveBasicStudentWithExtrasList(basicStudentExtrasParamList, sysUser);
         for (ExamStudent examStudent : examStudentList) {
-            examStudent.setClazzId(String.valueOf(basicClazzService.getOne(new QueryWrapper<BasicClazz>().lambda().eq(BasicClazz::getClazzName,examStudent.getClazzName())).getId()));
+            examStudent.setClazzId(String.valueOf(basicClazzService.getOne(new QueryWrapper<BasicClazz>().lambda().eq(BasicClazz::getClazzName, examStudent.getClazzName())).getId()));
         }
         examStudentService.saveBatch(examStudentList);
 

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

@@ -752,12 +752,12 @@ public class PrintCommonServiceImpl implements PrintCommonService {
     @Override
     public List<BasicCourse> list(String param, List<Long> printPlanIdList, Long teachingRoomId) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Set<Long> orgIds = null;
-        if (Objects.nonNull(teachingRoomId)) {
+        Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(teachingRoomId);
+        /*if (Objects.nonNull(teachingRoomId)) {
             orgIds = new HashSet<>(Arrays.asList(teachingRoomId));
         } else {
             orgIds = teachcloudCommonService.listSubOrgIds(teachingRoomId);
-        }
+        }*/
         if (printPlanIdList.size() == 0) {
             QueryWrapper<BasicCourse> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId)