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

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

@@ -51,7 +51,6 @@ public class ImLiveRoomBlackServiceImpl extends ServiceImpl<ImLiveRoomBlackDao,
      */
     @Override
     public PageInfo<SysUser> queryStudentList(Map<String, Object> param) {
-        WrapperUtil.toStr(param, "search", "搜索关键字不能为空");
         Page<SysUser> pageInfo = PageUtil.getPageInfo(param);
         pageInfo.setDesc("a.id_");
         Integer tenantId = TenantContextHolder.getTenantId();

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

@@ -31,18 +31,22 @@
              a.phone_     as phone
         from sys_user as a
         left join im_live_room_black as b on a.id_ != b.user_id_
+        <if test="param.roomUid != null">
+            and b.room_uid_ = #{param.roomUid}
+        </if>
         where a.user_type_ like '%STUDENT%'
         and a.lock_flag_ = 0
         and a.del_flag_ = 0
-        and b.room_uid_ = #{roomUid}
-        <if test="tenantId != null ">
-            and tenant_id_ = #{tenantId}
+        <if test="param.tenantId != null ">
+            and tenant_id_ = #{param.tenantId}
         </if>
+        <if test="param.search != null ">
             and (
-                 `id_` LIKE CONCAT('%', #{search},'%')
-                  OR `username_` LIKE CONCAT('%', #{search},'%')
-                 OR `phone_` LIKE CONCAT('%', #{search},'%')
+                 a.`id_` LIKE CONCAT('%', #{param.search},'%')
+                  OR a.`username_` LIKE CONCAT('%', #{param.search},'%')
+                 OR a.`phone_` LIKE CONCAT('%', #{param.search},'%')
                )
+        </if>
     </select>
 
     <select id="queryBlackList"  parameterType="map" resultType="com.ym.mec.biz.dal.vo.ImLiveRoomBlackVo">
@@ -57,7 +61,7 @@
           and a.room_uid_ = #{param.roomUid}
         <if test="param.search != null ">
             and (
-            a.`user_id_` LIKE CONCAT('%', #{param.search},'%')
+            b.`user_id_` LIKE CONCAT('%', #{param.search},'%')
             OR b.`username_` LIKE CONCAT('%', #{param.search},'%')
             OR b.`phone_` LIKE CONCAT('%', #{param.search},'%')
             )