Merge branch 'saas_hgw_2022_6_6' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveRoomPurviewServiceImpl.java

@@ -101,7 +101,7 @@ public class ImLiveRoomPurviewServiceImpl extends ServiceImpl<ImLiveRoomPurviewD
                 checkVal = true;
             }
         }
-        if(checkVal){
+        if(!checkVal){
             throw new BizException("必需要有一个查询条件");
         }
     }

mec-biz/src/main/resources/config/mybatis/ImLiveRoomPurviewMapper.xml

@@ -93,8 +93,8 @@
             <if test="param.organIds != null and param.organIds != ''">
                 AND FIND_IN_SET(su.organ_id_,#{param.organIds})
             </if>
-            <if test="param.subjectIds != null">
-                AND FIND_IN_SET(s.subject_id_list_,#{param.subjectIds})
+            <if test="param.subjectId != null">
+                AND FIND_IN_SET(s.subject_id_list_,#{param.subjectId})
             </if>
             <if test="param.schoolIds != null">
                 AND FIND_IN_SET(s.cooperation_organ_id_ ,#{param.schoolIds})