3.2.5 bug修改

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

@@ -156,6 +156,7 @@ public class DataSyncServiceImpl implements DataSyncService {
                     if (examTaskSync == null) {
                         examTaskSync = new ExamTaskSync(schoolId, examTask.getExamId(), examTask.getCourseCode(), examTask.getPaperNumber(), orgCode, Math.toIntExact(thirdRelateId), syncStatus, sysUser.getId(), System.currentTimeMillis(), null);
                     } else {
+                        examTaskSync.setThirdRelateId(Math.toIntExact(thirdRelateId));
                         examTaskSync.setSyncStatus(syncStatus);
                         examTaskSync.setSyncStartTime(System.currentTimeMillis());
                         examTaskSync.setSyncUserId(sysUser.getId());

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

@@ -19,6 +19,7 @@ import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -50,7 +51,7 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
             return examStudents.stream().filter(m -> StringUtils.isNotBlank(m.getPaperType())).map(m -> m.getPaperType()).distinct().collect(Collectors.toList());
         } else {
             ExamDetailCourse examDetailCourse = examDetailCourseMapper.selectById(examDetailCourseId);
-            if(examDetailCourse != null && StringUtils.isNotBlank(examDetailCourse.getPaperType())){
+            if (examDetailCourse != null && StringUtils.isNotBlank(examDetailCourse.getPaperType())) {
                 return Arrays.stream(examDetailCourse.getPaperType().split(",")).collect(Collectors.toList());
             }
         }
@@ -93,10 +94,10 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
     @Override
     public BasicCollege getBasicCollegeByBelongOrgId(String studentCode, Long schoolId) {
         List<BasicCollege> basicCollegeList = this.baseMapper.getBasicCollegeByBelongOrgId(studentCode, schoolId);
-        if (basicCollegeList.size() != 1){
-            throw ExceptionResultEnum.ERROR.exception("学生学院数据异常");
+        if (!CollectionUtils.isEmpty(basicCollegeList)) {
+            return basicCollegeList.get(0);
         }
-        return basicCollegeList.get(0);
+        return null;
     }
 
     @Override
@@ -114,7 +115,7 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
         List<SyncExamStudentDto> syncExamStudentDtoList = new ArrayList<>();
         for (ExamDetailCourseDto examDetailCourseDto : examDetailCourseList) {
             List<SyncExamStudentDto> syncExamStudentDtos = this.baseMapper.listStudentByExamDetailCourseId(examDetailCourseDto.getId());
-            if(!syncExamStudentDtos.isEmpty()){
+            if (!syncExamStudentDtos.isEmpty()) {
                 syncExamStudentDtoList.addAll(syncExamStudentDtos);
             }
         }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/RedisUtil.java

@@ -160,7 +160,7 @@ public class RedisUtil {
      * @return
      */
     public void releaseLock(String key) {
-        redisTemplate.expire(key, 100, TimeUnit.MILLISECONDS);
+        redisTemplate.expire(key, 1, TimeUnit.MILLISECONDS);
     }
 
     /**