fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -3812,12 +3812,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             } catch (Exception e) {
                 throw new CustomException(e.getMessage());
             }
-        }
-        Long aLong = baseMapper.checkFinishRequiredCourse(bo);
-        if (aLong > 0){
             List<Long> goodsIds = baseMapper.getFinishRequiredCourse(bo);
-            Goods goods = iGoodsService.getById(goodsIds.get(0));
-            throw new CustomException("请按顺序学习，把【"+goods.getGoodsName()+"】学习完成，再学习另一个课程");
+            if(Validator.isNotEmpty(goodsIds)&&goodsIds.size()>0){
+                Goods goods = iGoodsService.getById(goodsIds.get(0));
+                throw new CustomException("请按顺序学习，把【"+goods.getGoodsName()+"】学习完成，再学习另一个课程");
+            }
         }
         return 0L;
     }

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

@@ -496,7 +496,11 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                 }else{
                     throw new CustomException("未报名推送成功，无法学习",600);
                 }
-
+                ClassGradeUserQueryBo userQueryBo = new ClassGradeUserQueryBo();
+                userQueryBo.setGoodsId(bo.getGoodsId());
+                userQueryBo.setGradeId(bo.getGradeId());
+                userQueryBo.setUserId(bo.getUserId());
+                iClassGradeUserService.checkFinishRequiredCourse(userQueryBo);
             }
 
         }

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

@@ -1884,6 +1884,7 @@
           AND (unix_timestamp(now())  BETWEEN cg.class_start_time and cg.class_end_time)
           and g.business_id = #{businessId}
           and g.goods_id != #{goodsId}
+          and cgu.`status` = 1
           AND (
             SELECT
             IFNULL( count(*), 0 )
@@ -1891,8 +1892,7 @@
             user_period up
             WHERE
             1 = 1
-          AND up.user_id = cgu.user_id
-          AND up.grade_id = cgu.grade_id
+          AND up.order_goods_id = cgu.order_goods_id
             )>0
     </select>