From 2dc363ab138c1ce55cf9b991785663d824cec20b Mon Sep 17 00:00:00 2001
From: Ziin <hiziying@hotmail.com>
Date: Fri, 1 Aug 2025 13:28:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=AD=89=E7=BA=A7=E7=AD=9B=E9=80=89=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employeehosts/vo/EmployeeHostsPageReqVO.java  |  2 +-
 .../admin/newhosts/vo/NewHostsPageReqVO.java      |  2 +-
 .../service/newhosts/NewHostsServiceImpl.java     |  2 --
 .../mapper/employeehosts/EmployeeHostsMapper.xml  | 15 ++++++++++-----
 .../resources/mapper/newhosts/NewHostsMapper.xml  |  7 +++++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java
index 7df0e49..2594669 100644
--- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java
+++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsPageReqVO.java
@@ -20,7 +20,7 @@ public class EmployeeHostsPageReqVO extends PageParam {
     private Long userId;
 
     @Schema(description = "主播等级")
-    private String hostsLevel;
+    private List<String> hostsLevel;
 
     @Schema(description = "主播金币")
     private Integer[] hostsCoins;
diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java
index e83d3a1..ace2d78 100644
--- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java
+++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsPageReqVO.java
@@ -18,7 +18,7 @@ public class NewHostsPageReqVO extends PageParam {
     private String hostsId;
 
     @Schema(description = "主播等级")
-    private String hostsLevel;
+    private List<String> hostsLevel;
 
     @Schema(description = "主播金币")
     private Integer hostsCoins;
diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/newhosts/NewHostsServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/newhosts/NewHostsServiceImpl.java
index e4c3134..a02dcba 100644
--- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/newhosts/NewHostsServiceImpl.java
+++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/newhosts/NewHostsServiceImpl.java
@@ -22,8 +22,6 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
-
 
 /**
  * 主播数据 Service 实现类
diff --git a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
index d267b37..48831be 100644
--- a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
+++ b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
@@ -78,10 +78,12 @@
             and operation_status =#{req.operationStatus,jdbcType=INTEGER}
         </if>
         <!--  主播 Id 模糊搜索    -->
-        <if test="req.hostsId != '' and req.hostsId != null  ">
-            and ns.hosts_id like concat(#{req.hostsId,jdbcType=VARCHAR},'%')
+        <if test="req.hostsLevel != null and req.hostsLevel.size() > 0">
+            AND ns.hosts_level IN
+            <foreach collection="req.hostsLevel" item="level" open="(" separator="," close=")">
+                #{level, jdbcType=VARCHAR}
+            </foreach>
         </if>
-
         <!--  主播等级筛选    -->
         <if test="req.hostsLevel != null and req.hostsLevel != ''">
             and ns.hosts_level =#{req.hostsLevel,jdbcType=VARCHAR}
@@ -206,8 +208,11 @@
             and ns.hosts_id like concat(#{req.hostsId,jdbcType=VARCHAR},'%')
         </if>
         <!--  主播等级筛选    -->
-        <if test="req.hostsLevel != null and req.hostsLevel != ''">
-            and ns.hosts_level =#{req.hostsLevel,jdbcType=VARCHAR}
+        <if test="req.hostsLevel != null and req.hostsLevel.size() > 0">
+            AND ns.hosts_level IN
+            <foreach collection="req.hostsLevel" item="level" open="(" separator="," close=")">
+                #{level, jdbcType=VARCHAR}
+            </foreach>
         </if>
         <!-- 今日主播金币筛选   -->
         <if test="req.hostsCoinsMin != null  and req.hostsCoinsMax == null  ">
diff --git a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml
index cef33a4..bde002c 100644
--- a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml
+++ b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml
@@ -35,8 +35,11 @@
             and ns.is_assigned =#{req.isAssigned,jdbcType=INTEGER}
         </if>
         <!--  主播等级筛选    -->
-        <if test="req.hostsLevel != null and req.hostsLevel != ''">
-            and ns.hosts_level =#{req.hostsLevel,jdbcType=VARCHAR}
+        <if test="req.hostsLevel != null and req.hostsLevel.size() > 0">
+            AND ns.hosts_level IN
+            <foreach collection="req.hostsLevel" item="level" open="(" separator="," close=")">
+                #{level, jdbcType=VARCHAR}
+            </foreach>
         </if>
         <if test="req.aiOperation != null ">
             and ns.ai_operation = #{req.aiOperation,jdbcType=TINYINT}