Просмотр исходного кода

Merge branch 'dev_v3.2.0' into release_v3.2.0

caozixuan 2 лет назад
Родитель
Сommit
2eed2ee2c5

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

@@ -1796,7 +1796,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         File zipFile = new File(zipJoiner + dirNameTmp);
         if (!zipFile.getParentFile().exists()) {
             boolean mkd = zipFile.getParentFile().mkdirs();
-            boolean cf = zipFile.createNewFile();
+//            boolean cf = zipFile.createNewFile();
         }
 
         // 根文件路径

+ 0 - 2
distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -1112,8 +1112,6 @@
             IFNULL(b.exposed_paper_type,'') exposedPaperType,
             IFNULL(b.unexposed_paper_type,'') unexposedPaperType,
             so.name orgName,
-#             REPLACE(substring_index(substring_index(CONVERT((b.paper_attachment_ids ->>'$[*].cardId')
-#             USING utf8), ']', 1), '[',-1) examCardId,
             b.paper_attachment_ids paperAttachmentIds
         FROM
             exam_task a

+ 0 - 1
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/AuthInfoServiceImpl.java

@@ -127,7 +127,6 @@ public class AuthInfoServiceImpl implements AuthInfoService {
         if (Objects.nonNull(code)) {
             AuthOrgInfoDto authOrgInfoDto = commonCacheService.authInfoCache(code);
             if (Objects.isNull(authOrgInfoDto) || (Objects.nonNull(authOrgInfoDto) && authOrgInfoDto.getControl().hasExpired())) {
-                //TODO因授权文件失败暂时开发去掉
                 throw ExceptionResultEnum.AUTH_INFO_ERROR.exception();
             }
         }