ソースを参照

fix 业务层次

he2802 3 年 前
コミット
90d3235fcb

+ 4 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterSectionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
@@ -163,8 +164,9 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
                         courseMenuVo.setAudit(1L);
                     }
                     Integer learning = baseMapper.learningExamCheck(0L, courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), courseMenuVo.getTypeId());
-
-                    courseMenuVo.setLearning(new Long(learning));
+                   if(Validator.isNotEmpty(learning)){
+                       courseMenuVo.setLearning(new Long(learning));
+                   }
                 }
             }
         }

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsAttachedMapper.xml

@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				LEFT JOIN course_subject cs2 ON qb2.subject_id = cs2.id
 		WHERE
 			ga.goods_id = #{goodsId}
-		order by ga.sort asc
+		order by ga.sort,ga.create_time  asc
     </select>
 
 	<select id="selectDoList" parameterType="com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo" resultMap="GoodsAttachedResultVo">