更改sql

src/main/java/org/rcisoft/business/blesson/dao/BLessonRepository.java

@@ -1382,10 +1382,16 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             " left join b_viewrange bv on bl.business_id = bv.lesson_id  " +
             " and bv.del_flag != 1 and bv.flag = 1   " +
             " 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_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   " +
-
+            " <if test=\"model.labelId !=null and model.labelId != ''\">" +
+            " and (bll.label_id = #{model.labelId} or FIND_IN_SET(#{model.labelId},bl.push_lable) or blname.l_name = #{model.lName}) " +
+            " </if>" +
             " <if test=\"model.valueScreen !=null and model.valueScreen != ''\"> ${model.valueScreen} </if>" +
-            " <if test=\"model.labelId !=null and model.labelId != ''\">and bl.push_lable like CONCAT('%',#{model.labelId},'%') </if>" +
+            " <if test=\"model.labelId !=null and model.labelId != ''\">" +
+            " and bl.push_lable like CONCAT('%',#{model.labelId},'%') " +
+            " </if>" +
             " <if test=\"model.lessonType !=null and model.lessonType != ''\">and bl.lesson_type = #{model.lessonType}</if>" +
             " and bl.release_state = 2 " +
             " and ((bvs.type = 0 and bvs.target_id = #{model.userId}) " +