Merge remote-tracking branch 'origin/meiteng' into meiteng

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

@@ -163,7 +163,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             "      or (bvs.type = 1 and bvs.target_id in " +
             "      <foreach item='item' index='index' collection='departs' open='(' separator=',' close=')'> #{item} </foreach>)" +
             "    </if> " +
-            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 ))) " +
+            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 AND lesson_id IS NOT NULL ))) " +
             " and bl.person_number > (select `value` from b_dictionary where type = 'ZXRS') " + //ZXRS 在学人数
             " order by bl.person_number,bl.release_date desc " +
             "</script>")
@@ -251,7 +251,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             "      or (bvs.type = 1 and bvs.target_id in " +
             "      <foreach item='item' index='index' collection='departs' open='(' separator=',' close=')'> #{item} </foreach>)" +
             "    </if> " +
-            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 ))) " +
+            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 AND lesson_id IS NOT NULL ))) " +
             " and bl.person_number > (select `value` from b_dictionary where type = 'GZRS') " + //ZXRS 关注人数
             " order by bl.collect_number,bl.release_date desc " +
             "</script>")
@@ -316,7 +316,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             "      or (bvs.type = 1 and bvs.target_id in " +
             "      <foreach item='item' index='index' collection='departs' open='(' separator=',' close=')'> #{item} </foreach>)" +
             "    </if> " +
-            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 ))) " +
+            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 AND lesson_id IS NOT NULL ))) " +
             " order by T.bsum , b.collect_number desc" +
             "</script>")
     @ResultMap(value = "BaseResultMap")
@@ -370,7 +370,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             "      or (bvs.type = 1 and bvs.target_id in " +
             "      <foreach item='item' index='index' collection='param.departs' open='(' separator=',' close=')'> #{item} </foreach>)" +
             "    </if> " +
-            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 ))) " +
+            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 AND lesson_id IS NOT NULL ))) " +
             " <if test= \" param.viewParam !=null and param.viewParam != ''\">and (bl.lesson_name like CONCAT('%',#{param.viewParam},'%') " +
             "   or su.name like CONCAT('%',#{param.viewParam},'%'))</if> " +
             " <if test= \" courseIds !=null and courseIds.size() > 0 \">and course_id in " +
@@ -562,7 +562,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             "      or (bvs.type = 1 and bvs.target_id in " +
             "      <foreach item='item' index='index' collection='model.departs' open='(' separator=',' close=')'> #{item} </foreach>)" +
             "    </if> " +
-            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 ))) " +
+            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 AND lesson_id IS NOT NULL ))) " +
             " <if test= \" model.viewParam !=null and model.viewParam != ''\">and (bl.lesson_name like CONCAT('%',#{model.viewParam},'%') " +
             "   or su.name like CONCAT('%',#{model.viewParam},'%'))</if> " +
             " <if test= \" model.courseIds !=null and model.courseIds.size() > 0 \">and course_id in " +
@@ -666,7 +666,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             "      or (bvs.type = 1 and bvs.target_id in " +
             "      <foreach item='item' index='index' collection='model.departs' open='(' separator=',' close=')'> #{item} </foreach>)" +
             "    </if> " +
-            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 ))) " +
+            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 AND lesson_id IS NOT NULL ))) " +
             " and bl.person_number > (select `value` from b_dictionary where type = 'ZXRS') " + //ZXRS 在学人数
             " <if test= \" model.viewParam !=null and model.viewParam != ''\">and (bl.lesson_name like CONCAT('%',#{model.viewParam},'%') " +
             "   or su.name like CONCAT('%',#{model.viewParam},'%'))</if> " +
@@ -720,7 +720,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             "      or (bvs.type = 1 and bvs.target_id in " +
             "      <foreach item='item' index='index' collection='model.departs' open='(' separator=',' close=')'> #{item} </foreach>)" +
             "    </if> " +
-            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 ))) " +
+            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 AND lesson_id IS NOT NULL ))) " +
             " and bl.person_number > (select `value` from b_dictionary where type = 'GZRS') " + //ZXRS 关注人数
             " <if test= \" model.viewParam !=null and model.viewParam != ''\">and (bl.lesson_name like CONCAT('%',#{model.viewParam},'%') " +
             "   or su.name like CONCAT('%',#{model.viewParam},'%'))</if> " +
@@ -793,7 +793,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             "      or (bvs.type = 1 and bvs.target_id in " +
             "      <foreach item='item' index='index' collection='model.departs' open='(' separator=',' close=')'> #{item} </foreach>)" +
             "    </if> " +
-            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 ))) " +
+            "  or (bl.business_id not in (select lesson_id from b_viewrange where del_flag != 1 and flag = 1 AND lesson_id IS NOT NULL))) " +
             " <if test= \" model.viewParam !=null and model.viewParam != ''\">and (bl.lesson_name like CONCAT('%',#{model.viewParam},'%') " +
             "   or su.name like CONCAT('%',#{model.viewParam},'%'))</if> " +
             " <if test= \" model.courseIds !=null and model.courseIds.size() > 0 \">and course_id in " +

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

@@ -74,7 +74,7 @@ public interface BRecommendRepository extends BaseMapper<BRecommend> {
             " and su.corp_id = #{corpId} "+
 
             " <if test=\"viewParam!=null and viewParam != ''\">and su.name like CONCAT('%',#{viewParam},'%')</if>" +
-
+            " and brs.type = '0' "+
             " and br.lesson_id = #{lessonId}</script>")
     List<FindLessonRecommendRspDTO> queryRecommendPersonByLessonId(FindLessonRecommendDTO param);
 
@@ -87,6 +87,7 @@ public interface BRecommendRepository extends BaseMapper<BRecommend> {
 
 //            " and bl.corp_id = #{corpId} "+
 
+            " and brs.type = '1' "+
             "   <if test=\"departs != null and departs.size() > 0 \"> " +
             "        and brs.target_id in " +
             "       <foreach item='item' index='index' collection='departs' open='(' separator=',' close=')'> #{item.departId} </foreach> " +

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -431,7 +431,6 @@ public class BLessonServiceImpl implements BLessonService {
             bLessonPersonRepository.updateList(updateBLessonPerson,inLessonIds);
             //从学生Id中删除已更新的学生id
             userIds.removeAll(inLessonIds);
-            
         }
         //剩余学生添加至b_lesson_person表
         List<BLessonPerson> bLessonPersonOthers = new ArrayList<>();