Merge remote-tracking branch 'origin/dev_v3.2.0' into dev_v3.2.0

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

@@ -1727,13 +1727,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
         SysOrg schoolOrg = schoolOrgList.get(0);
         List<SysOrg> collegeList = orgList.stream().filter(e -> Objects.equals(schoolOrg.getId(), e.getParentId())).collect(Collectors.toList());
-        if (collegeList.size() != 1) {
-            throw ExceptionResultEnum.ERROR.exception("学院级机构信息异常");
+        SysOrg college = new SysOrg();
+        if (collegeList.size() == 1){
+            college = collegeList.get(0);
         }
 
-        SysOrg college = collegeList.get(0);
-
-
         // 流程id
         Long flowId = examTask.getFlowId();
 
@@ -1756,8 +1754,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         // ---- 组装Dto
         ExamTaskApprovalFormDto examTaskApprovalFormDto = new ExamTaskApprovalFormDto();
         BasicInfo basicInfo = new BasicInfo();
-        basicInfo.setCollegeId(college.getId());
-        basicInfo.setCollegeName(college.getName());
+        if (Objects.nonNull(college)){
+            basicInfo.setCollegeId(college.getId());
+            basicInfo.setCollegeName(college.getName());
+        }
         basicInfo.setTeachingRoomId(teachingRoomId);
         basicInfo.setTeachingRoomName(teachingRoomName);
         basicInfo.setPaperName(paperName);