fix 合并

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -74,6 +74,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     public GoodsVo queryById(Long goodsId){
         Goods db = this.baseMapper.selectById(goodsId);
+        if(Validator.isEmpty(db)){
+            return null;
+        }
         GoodsVo goodsVo = BeanUtil.toBean(db, GoodsVo.class);
         //试听配置
         if(db.getGoodsAuditionConfig()!=null){

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

@@ -272,6 +272,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     studyCountLog.setUpdateTime(DateUtils.getNowTime());
                     studyCountLog.setOldGradeId(item.getUserId());
                     iStudyCountLogService.save(studyCountLog);
+                    //老班学习记录去掉
+
                 }
             }
         }

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -255,9 +255,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             user_period up
                 LEFT JOIN user_period_status ups ON ups.period_id = up.id
+                LEFT JOIN class_grade_user cgu on up.grade_id = cgu.grade_id and up.user_id = cgu.user_id
         WHERE
             up.user_id = #{userId}
           and ups.period_status =1
+          and cgu.change_grade = 0
           and ups.`status` in (0,3)
     </select>
     <select id="subscribeSum" parameterType="Long" resultType="Long">

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         u.grade_id,
         u.user_id,
         (SELECT i.business_name FROM course_business i where i.id = g.business_id) as business_name,
-        (SELECT p.project_name FROM course_project_type p where p.id = g.business_id) as project_name,
+        (SELECT p.project_name FROM course_project_type p where p.id = g.project_id) as project_name,
         (SELECT s.school_name FROM school s  where s.id = g.school_id) as school_name,
         (SELECT e.education_name FROM course_education_type e  where e.id = g.education_type_id) as education_name,
         (SELECT r.start_time FROM user_study_record r  where 1=1  and r.user_id = #{userId} AND g.goods_id=r.goods_id ORDER BY r.start_time ASC LIMIT 1) as start_time,