he2802 2 年之前
父节点
当前提交
0d19df48a2

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserStudyRecordService.java

@@ -98,7 +98,7 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
 
 	List<ClassPeriodVo> menuAllListWithExam(UserStudyRecordQueryBo bo);
 
-	List<ClassPeriodVo> goodsAllListWithExam(UserStudyRecordQueryBo bo);
+	List<ClassPeriodVo>  goodsAllListWithExam(UserStudyRecordQueryBo bo);
 
 	List<SectionStudyRecordVo> listUserRecord(UserStudyRecordQueryBo bo);
 

+ 4 - 4
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -778,6 +778,10 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         if(Validator.isEmpty(bo.getCourseId())||Validator.isEmpty(bo.getOrderGoodsId())){
             throw new CustomException("参数缺失");
         }
+        ClassGradeUser classGradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper< ClassGradeUser >().eq(ClassGradeUser::getUserId, bo.getUserId()).eq(ClassGradeUser::getOrderGoodsId, bo.getOrderGoodsId()).last("limit 1"));
+        if(Validator.isEmpty(classGradeUser)){
+            throw new CustomException("非法数据",601);
+        }
         //存储整个目录节列表
         List<ClassPeriodVo> sectionList = new ArrayList<>();
         //获取课程目录
@@ -882,10 +886,6 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getOrderGoodsId())){
             throw new CustomException("参数缺失");
         }
-        ClassGradeUser classGradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper< ClassGradeUser >().eq(ClassGradeUser::getUserId, bo.getUserId()).eq(ClassGradeUser::getOrderGoodsId, bo.getOrderGoodsId()).last("limit 1"));
-        if(Validator.isEmpty(classGradeUser)){
-            throw new CustomException("非法数据",601);
-        }
         //存储整个目录节列表
         List<ClassPeriodVo> sectionList = new ArrayList<>();
         GoodsCourseQueryBo queryBo = new GoodsCourseQueryBo();

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseSectionMapper.xml

@@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             ccs.section_id =#{section_id}
             and cc.status =1
+        ORDER BY ccs.sort
     </select>
 
 

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -1549,6 +1549,7 @@
         WHERE
             gc.goods_id = #{goodsId}
           AND m.type =  2
+        ORDER BY m.sort
     </select>
 
     <select id="selectOfficialInfoCount" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="long">