1.修复课程中心因为多开课重复 2.修复课程的课时数量 3.修改统计数据返回格式

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseInfoMapper.xml

@@ -236,8 +236,9 @@
             IFNULL(ci.END_TIME,'') as endTime,
             IFNULL(ci.SEMESTER_ID ,'') as semesterId,
             IFNULL(s.NAME ,'') as semesterIdName,
+            IFNULL(ci.CREATE_TIME,'') as courseCreateTime,
             IFNULL(ci.VIEW_COUNT ,'') as viewCount,
-            IFNULL(ci.HOUR_COUNT ,'') as hourCount
+            IFNULL(hc.hourCount ,'0') as hourCount
         FROM COURSE_INFO ci
         LEFT JOIN COURSE_OPEN cop ON ci.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
         LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/VideoAnalysisProgressMapper.xml

@@ -1032,7 +1032,7 @@
     <select id="getJumpTimeContactListStudyBehavior" resultType="java.util.Map">
         SELECT
             su.ID AS userId,
-            IFNULL(finalFive.jumpTimeContact,0) AS jumpTimeContact
+            IFNULL(finalFive.jumpTimeContact,'') AS jumpTimeContact
         FROM (
             SELECT su1.* FROM SYS_USER su1
             WHERE su1.DELETE_FLAG='NOT_DELETE'

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/TranscodingService.java

@@ -16,7 +16,7 @@ public interface TranscodingService {
      * 视频资源转码
      *
      * @param transcodingReqDTO 转码请求
-     * @return 转码结果
+     * @return 转码结果1
      *
      * @author jinjilong
      */

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java

@@ -316,12 +316,11 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Override
     public List<Tree<String>> treeAllParam(Map param) {
         QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().orderByDesc(SysOrg::getSortCode);
         if (ObjectUtil.isNotEmpty(param.get("category")))
         {
             queryWrapper.lambda().eq(SysOrg::getCategory, param.get("category"));
         }
-//        queryWrapper.lambda().eq(SysOrg::getIsResourceaccount, "0");
+        queryWrapper.lambda().orderByAsc(SysOrg::getSortCode);
         List<SysOrg> collegeList = this.list(queryWrapper);
         List<TreeNode<String>> treeNodeList = collegeList.stream().map(org ->
                 new TreeNode<>(org.getId(), org.getParentId(),