ziin/vvDataAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(mapper): 修复删除状态过滤条件并新增主播类型筛选

Browse Source
This commit is contained in:
ziin
2025-12-03 15:19:03 +08:00
parent 9a991e527a
commit 08243e390e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml
View File

@@ -145,8 +145,8 @@
and deleted = 0 and deleted = 0
</if> </if>
<if test="dto.isDelete == 3"> <if test="dto.isDelete == 3">
and deleted = 0 and (deleted = 0
or deleted = 1 or deleted = 1)
</if> </if>
<if test="dto.userId != null" > <if test="dto.userId != null" >
and sbr.user_id = #{dto.userId,jdbcType=VARCHAR} and sbr.user_id = #{dto.userId,jdbcType=VARCHAR}

13
tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
View File

@@ -122,6 +122,9 @@
<if test="req.country != '' and req.country !=null "> <if test="req.country != '' and req.country !=null ">
and ns.country = #{req.country} and ns.country = #{req.country}
</if> </if>
<if test="req.hostsKind != null">
and ns.hosts_kind = #{req.hostsKind,jdbcType=INTEGER}
</if>
<!-- 按照入库时间筛选主播 --> <!-- 按照入库时间筛选主播 -->
<if test="req.createTime != null"> <if test="req.createTime != null">
and DATE(ns.create_time) =#{req.createTime} and DATE(ns.create_time) =#{req.createTime}
@@ -259,8 +262,8 @@
and deleted = 0 and deleted = 0
</if> </if>
<if test="req.isDelete == 3"> <if test="req.isDelete == 3">
and deleted = 0 and (deleted = 0
or deleted = 1 or deleted = 1)
</if> </if>
<!-- 筛选员工名下主播 --> <!-- 筛选员工名下主播 -->
<if test="req.userId != null "> <if test="req.userId != null ">
@@ -270,6 +273,10 @@
<if test="req.region!= '' and req.region != null"> <if test="req.region!= '' and req.region != null">
and ci.country_group_name =#{req.region,jdbcType=VARCHAR} and ci.country_group_name =#{req.region,jdbcType=VARCHAR}
</if> </if>
<!-- 主播类型筛选 -->
<if test="req.hostsKind != null">
and ns.hosts_kind = #{req.hostsKind,jdbcType=INTEGER}
</if>
<if test="req.country != '' and req.country !=null "> <if test="req.country != '' and req.country !=null ">
and ns.country = #{req.country} and ns.country = #{req.country}
</if> </if>
@@ -283,7 +290,7 @@
and DATE(ns.update_time) =#{req.updateTime} and DATE(ns.update_time) =#{req.updateTime}
</if> </if>
<if test="req.operationStatus != null"> <if test="req.operationStatus != null">
and operation_status =#{req.operationStatus,jdbcType=INTEGER} and operation_status = #{req.operationStatus,jdbcType=INTEGER}
</if> </if>
<!-- 主播 Id 模糊搜索 --> <!-- 主播 Id 模糊搜索 -->
<if test="req.hostsId != '' and req.hostsId != null "> <if test="req.hostsId != '' and req.hostsId != null ">