From 08243e390efb95741609c55c9c3a845b0cac9ad9 Mon Sep 17 00:00:00 2001
From: ziin <hiziying@hotmail.com>
Date: Wed, 3 Dec 2025 15:19:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(mapper):=20=E4=BF=AE=E5=A4=8D=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=8A=B6=E6=80=81=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=B9=B6=E6=96=B0=E5=A2=9E=E4=B8=BB=E6=92=AD=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employeebigbrother/EmployeeBigBrotherMapper.xml |  4 ++--
 .../mapper/employeehosts/EmployeeHostsMapper.xml    | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml
index 2c1701f..ba158b5 100644
--- a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml
+++ b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml
@@ -145,8 +145,8 @@
             and deleted = 0
         </if>
         <if test="dto.isDelete == 3">
-            and deleted = 0
-            or deleted = 1
+            and (deleted = 0
+            or deleted = 1)
         </if>
             <if test="dto.userId != null" >
                 and sbr.user_id = #{dto.userId,jdbcType=VARCHAR}
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 ba234fd..786b028 100644
--- a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
+++ b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
@@ -122,6 +122,9 @@
         <if test="req.country != '' and req.country !=null ">
             and ns.country = #{req.country}
         </if>
+        <if test="req.hostsKind != null">
+            and ns.hosts_kind = #{req.hostsKind,jdbcType=INTEGER}
+        </if>
         <!--  按照入库时间筛选主播    -->
         <if test="req.createTime != null">
             and DATE(ns.create_time) =#{req.createTime}
@@ -259,8 +262,8 @@
             and deleted = 0
         </if>
         <if test="req.isDelete == 3">
-            and deleted = 0
-            or deleted = 1
+            and (deleted = 0
+            or deleted = 1)
         </if>
         <!--  筛选员工名下主播 -->
         <if test="req.userId != null ">
@@ -270,6 +273,10 @@
         <if test="req.region!= '' and req.region != null">
             and ci.country_group_name =#{req.region,jdbcType=VARCHAR}
         </if>
+        <!--  主播类型筛选    -->
+        <if test="req.hostsKind != null">
+            and ns.hosts_kind = #{req.hostsKind,jdbcType=INTEGER}
+        </if>
         <if test="req.country != '' and req.country !=null ">
             and ns.country = #{req.country}
         </if>
@@ -283,7 +290,7 @@
             and DATE(ns.update_time) =#{req.updateTime}
         </if>
         <if test="req.operationStatus != null">
-            and operation_status =#{req.operationStatus,jdbcType=INTEGER}
+            and operation_status = #{req.operationStatus,jdbcType=INTEGER}
         </if>
         <!--  主播 Id 模糊搜索    -->
         <if test="req.hostsId != '' and req.hostsId != null  ">