Skip to content

E
education
Commit 69ef63dd authored by liuyuanjun's avatar liuyuanjun
Browse files
Options

修改bug29621

parent 91fcdae7
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
src/main/java/org/rcisoft/business/blesson/dao/BLessonRepository.java
View file @ 69ef63dd
...@@ -894,12 +894,13 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -894,12 +894,13 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
" left join b_recommend_son brs on br.business_id = brs.recommend_id " + " left join b_recommend_son brs on br.business_id = brs.recommend_id " +
" left join b_lesson_label bll on bl.business_id = bll.lesson_id " + " left join b_lesson_label bll on bl.business_id = bll.lesson_id " +
" left join b_lesson_corp blc on blc.lesson_id = bl.business_id and bl.corp_id = '###' " + " left join b_lesson_corp blc on blc.lesson_id = bl.business_id and bl.corp_id = '###' " +
" left join b_label blname on blname.business_id = bll.label_id or FIND_IN_SET(blname.business_id,bl.push_lable)" +
" where bl.del_flag != 1 and bl.flag = 1 " + " where bl.del_flag != 1 and bl.flag = 1 " +
" and (bl.corp_id = #{model.corpId} or blc.corp_id = #{model.corpId}) "+ " and (bl.corp_id = #{model.corpId} or blc.corp_id = #{model.corpId}) "+
" <if test=\"model.valueScreen !=null and model.valueScreen != ''\"> ${model.valueScreen} </if>" + " <if test=\"model.valueScreen !=null and model.valueScreen != ''\"> ${model.valueScreen} </if>" +
" <if test=\"model.labelId !=null and model.labelId != ''\">" + " <if test=\"model.labelId !=null and model.labelId != ''\">" +
" and (bll.label_id = #{model.labelId} or FIND_IN_SET(#{model.labelId},bl.push_lable)) " + " and (bll.label_id = #{model.labelId} or FIND_IN_SET(#{model.labelId},bl.push_lable) or FIND_IN_SET(blname.business_id,bl.push_lable) " +
" </if>" + " </if>" +
" <if test=\"model.lessonType !=null and model.lessonType != ''\">and bl.lesson_type = #{model.lessonType}</if>" + " <if test=\"model.lessonType !=null and model.lessonType != ''\">and bl.lesson_type = #{model.lessonType}</if>" +
" and bl.release_state = 2 " + " and bl.release_state = 2 " +
...@@ -955,12 +956,13 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -955,12 +956,13 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
" left join b_lesson_label bll on bl.business_id = bll.lesson_id " + " left join b_lesson_label bll on bl.business_id = bll.lesson_id " +
// " left join b_course bc on bc.business_id = bl.course_id " + // " left join b_course bc on bc.business_id = bl.course_id " +
" left join b_lesson_corp blc on blc.lesson_id = bl.business_id and bl.corp_id = '###' " + " left join b_lesson_corp blc on blc.lesson_id = bl.business_id and bl.corp_id = '###' " +
" left join b_label blname on blname.business_id = bll.label_id or FIND_IN_SET(blname.business_id,bl.push_lable)" +
" where bl.del_flag != 1 and bl.flag = 1 " + " where bl.del_flag != 1 and bl.flag = 1 " +
" and (bl.corp_id = #{model.corpId} or blc.corp_id = #{model.corpId}) "+ " and (bl.corp_id = #{model.corpId} or blc.corp_id = #{model.corpId}) "+
" <if test=\"model.valueScreen !=null and model.valueScreen != ''\"> ${model.valueScreen} </if>" + " <if test=\"model.valueScreen !=null and model.valueScreen != ''\"> ${model.valueScreen} </if>" +
" <if test=\"model.labelId !=null and model.labelId != ''\">" + " <if test=\"model.labelId !=null and model.labelId != ''\">" +
" and (bll.label_id = #{model.labelId} or FIND_IN_SET(#{model.labelId},bl.push_lable)) " + " and (bll.label_id = #{model.labelId} or FIND_IN_SET(#{model.labelId},bl.push_lable) or FIND_IN_SET(blname.business_id,bl.push_lable) " +
" </if>" + " </if>" +
" <if test=\"model.lessonType !=null and model.lessonType != ''\">and bl.lesson_type = #{model.lessonType}</if>" + " <if test=\"model.lessonType !=null and model.lessonType != ''\">and bl.lesson_type = #{model.lessonType}</if>" +
" and bl.release_state = 2 " + " and bl.release_state = 2 " +
...@@ -1016,11 +1018,12 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -1016,11 +1018,12 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
" left join b_viewrange_son bvs on bv.business_id = bvs.viewrange_id " + " left join b_viewrange_son bvs on bv.business_id = bvs.viewrange_id " +
" left join b_lesson_label bll on bl.business_id = bll.lesson_id " + " left join b_lesson_label bll on bl.business_id = bll.lesson_id " +
" left join b_lesson_corp blc on blc.lesson_id = bl.business_id and bl.corp_id = '###' " + " left join b_lesson_corp blc on blc.lesson_id = bl.business_id and bl.corp_id = '###' " +
" left join b_label blname on blname.business_id = bll.label_id or FIND_IN_SET(blname.business_id,bl.push_lable)" +
" where bl.del_flag != 1 and bl.flag = 1 " + " where bl.del_flag != 1 and bl.flag = 1 " +
" and (bl.corp_id = #{model.corpId} or blc.corp_id = #{model.corpId}) "+ " and (bl.corp_id = #{model.corpId} or blc.corp_id = #{model.corpId}) "+
" <if test=\"model.valueScreen !=null and model.valueScreen != ''\"> ${model.valueScreen} </if>" + " <if test=\"model.valueScreen !=null and model.valueScreen != ''\"> ${model.valueScreen} </if>" +
" <if test=\"model.labelId !=null and model.labelId != ''\">" + " <if test=\"model.labelId !=null and model.labelId != ''\">" +
" and (bll.label_id = #{model.labelId} or FIND_IN_SET(#{model.labelId},bl.push_lable)) " + " and (bll.label_id = #{model.labelId} or FIND_IN_SET(#{model.labelId},bl.push_lable) or FIND_IN_SET(blname.business_id,bl.push_lable) " +
" </if>" + " </if>" +
" <if test=\"model.lessonType !=null and model.lessonType != ''\">and bl.lesson_type = #{model.lessonType}</if>" + " <if test=\"model.lessonType !=null and model.lessonType != ''\">and bl.lesson_type = #{model.lessonType}</if>" +
" and bl.release_state = 2 " + " and bl.release_state = 2 " +
...@@ -1090,10 +1093,11 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -1090,10 +1093,11 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
" <if test=\"model.valueScreen !=null and model.valueScreen != ''\"> ${model.valueScreen} </if>" + " <if test=\"model.valueScreen !=null and model.valueScreen != ''\"> ${model.valueScreen} </if>" +
" and b.business_id not in (SELECT DISTINCT b.business_id from " + " and b.business_id not in (SELECT DISTINCT b.business_id from " +
" b_lesson b left join b_lesson_person blp on b.business_id = blp.lesson_id " + " b_lesson b left join b_lesson_person blp on b.business_id = blp.lesson_id " +
" left join b_label blname on blname.business_id = bll.label_id or FIND_IN_SET(blname.business_id,b.push_lable)" +
" where blp.del_flag != 1 and blp.flag = 1 " + " where blp.del_flag != 1 and blp.flag = 1 " +
" and blp.person_id = #{model.userId} ) " + " and blp.person_id = #{model.userId} ) " +
" <if test=\"model.labelId !=null and model.labelId != ''\">" + " <if test=\"model.labelId !=null and model.labelId != ''\">" +
" and (bll.label_id = #{model.labelId} or FIND_IN_SET(#{model.labelId},b.push_lable)) " + " and (bll.label_id = #{model.labelId} or FIND_IN_SET(#{model.labelId},b.push_lable) or FIND_IN_SET(blname.business_id,b.push_lable) " +
" </if>" + " </if>" +
" <if test=\"model.lessonType !=null and model.lessonType != ''\">and b.lesson_type = #{model.lessonType}</if>" + " <if test=\"model.lessonType !=null and model.lessonType != ''\">and b.lesson_type = #{model.lessonType}</if>" +
" and b.release_state = 2 " + " and b.release_state = 2 " +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment