3.4.5 20250611 bug修复

distributed-print/install/mysql/init/teachcloud_db.sql

@@ -2139,6 +2139,7 @@ CREATE TABLE IF NOT EXISTS `mark_task`
     `ai_mark_error_msg` varchar(2000) DEFAULT NULL COMMENT 'AI评卷错误信息',
     `ai_mark_error_type` VARCHAR(10) NULL COMMENT 'AI评卷错误类型',
     `retry_count` INT NULL DEFAULT 0 COMMENT '重试次数',
+    `next_retry_time` BIGINT(20) NULL COMMENT '下一次重试时间',
     PRIMARY KEY (`id`) USING BTREE,
     UNIQUE KEY `index2` (`student_id`,`group_number`,`task_number`) USING BTREE,
     KEY                 `index3` (`user_id`,`status`,`marker_time`) USING BTREE,

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/OrgDto.java

@@ -44,6 +44,8 @@ public class OrgDto {
     @ApiModelProperty(value = "课程下系统用户")
     private List<SysUserResult> courseUserList;
 
+    private Long createTime;
+
     public List<SysUserResult> getCourseUserList() {
         return courseUserList;
     }
@@ -147,4 +149,12 @@ public class OrgDto {
     public void setSysUserList(List<SysUserResult> sysUserList) {
         this.sysUserList = sysUserList;
     }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysOrgServiceImpl.java

@@ -116,6 +116,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 if (Objects.nonNull(map.get(map.get(parentId).getParentId()))) {
                     map.get(map.get(parentId).getParentId()).getChildren().add(map.get(parentId));
                     deleteKeys.add(parentId);
+                    map.get(map.get(parentId).getParentId()).getChildren().sort(Comparator.comparing(OrgDto::getCreateTime));
                 }
             }
         }

teachcloud-common/src/main/resources/mapper/SysOrgMapper.xml

@@ -43,7 +43,8 @@
             so.enable,
             bc.id as campusId,
             bc.campus_name as campusName,
-            bc.campus_code as campusCode
+            bc.campus_code as campusCode,
+            so.create_time
         from
             sys_org so
         left join basic_campus bc on