Merge branch 'dev_v2.2.0' into release_v2.2.0

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

@@ -120,7 +120,7 @@ public class DataSyncServiceImpl implements DataSyncService {
             throw ExceptionResultEnum.ERROR.exception("请选择需要合并的印刷任务");
         }
 
-        if(Objects.isNull(syncDataParam.getThirdRelateId()) || Objects.isNull(syncDataParam.getThirdRelateName())){
+        if(Objects.isNull(syncDataParam.getThirdRelateId()) && Objects.isNull(syncDataParam.getThirdRelateName())){
             throw ExceptionResultEnum.ERROR.exception("考试ID、考试名称至少填一个");
         }
 

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

@@ -329,7 +329,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             t.setPaperType(stuPaperType);
                             i++;
                         }
-                        examStudentService.saveOrUpdateBatch(examStudentList);
                         // 试卷
                         list[2].addAll(paperPdfTempList);
                     }
@@ -362,6 +361,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             examDetailCourse.setAttachmentId(jsonObject.toJSONString());
                         }
                     }
+                    examStudentService.saveOrUpdateBatch(examStudentList);
                 }
                 examDetailCourse.setAttachmentId(jsonObject.toJSONString());
                 examTaskDetailService.saveOrUpdateBatch(examTaskDetailList);