测试增加标签筛选条件

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

@@ -826,10 +826,8 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             " ,suc.name createByName " +
             " from b_lesson bl " +
             " left join s_user su on su.business_id = bl.lecturer_id " +
-//            " and su.del_flag != 1 and su.flag = 1  " +
             " and su.corp_id = #{model.corpId} "+
             " left join s_user suc on suc.business_id = bl.create_by " +
-//            " and suc.del_flag != 1 and suc.flag = 1  " +
             " and suc.corp_id = #{model.corpId} "+
             " left join b_viewrange bv on bl.business_id = bv.lesson_id " +
             " and bv.del_flag != 1 and bv.flag = 1  " +
@@ -837,11 +835,12 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             " 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_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 " +
             " 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.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 blname.l_name = #{model.lName}) " +
             " </if>" +
             " <if test=\"model.lessonType !=null and model.lessonType != ''\">and bl.lesson_type = #{model.lessonType}</if>" +
             " and bl.release_state = 2 " +

src/main/java/org/rcisoft/business/blesson/dto/FindListLessonDTO.java

@@ -20,6 +20,9 @@ public class FindListLessonDTO {
     @ApiModelProperty(value = "接收标签id")
     private String labelId;
 
+    @ApiModelProperty(value = "接收标签名称")
+    private String lName;
+
     @ApiModelProperty(value = "发布时间排序（1升序 0降序）",required = false)
     private String releaseDateSort;