From 9a991e527a124c5b6ab1a359b76bd712ff31c425 Mon Sep 17 00:00:00 2001 From: ziin Date: Tue, 2 Dec 2025 16:31:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(tkdata):=20=E6=96=B0=E5=A2=9E=E6=8C=89?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89=E4=B8=BB?= =?UTF-8?q?=E6=92=AD/=E5=A4=A7=E5=93=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/EmployeeBigBrotherPageReqVO.java | 3 +++ .../employeehosts/vo/EmployeeHostsPageReqVO.java | 3 +++ .../employeebigbrother/EmployeeBigBrotherMapper.xml | 11 ++++++++++- .../mapper/employeehosts/EmployeeHostsMapper.xml | 11 ++++++++++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/vo/EmployeeBigBrotherPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/vo/EmployeeBigBrotherPageReqVO.java index c3ceac0..b8cfd0b 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/vo/EmployeeBigBrotherPageReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeebigbrother/vo/EmployeeBigBrotherPageReqVO.java @@ -147,4 +147,7 @@ public class EmployeeBigBrotherPageReqVO extends PageParam { @Schema(description = "粉丝团等级最小值", example = "0") private Integer fansLevelMin; + + @Schema(description = "是否删除", example = "0") + private Integer isDelete; } \ No newline at end of file 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 6d9c10a..223db46 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 @@ -136,4 +136,7 @@ public class EmployeeHostsPageReqVO extends PageParam { @Schema(description = "国家英文名", example = "United States") private String countryEng; + + @Schema(description = "是否删除", example = "0") + private Integer isDelete; } \ No newline at end of file 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 81cb90b..2c1701f 100644 --- a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml @@ -138,7 +138,16 @@ sbr.host_display_id,sbr.create_time, sbr.user_id, sbr.operation_status,sbr.fans_level from server_employee_big_brother sbr left join server_country_info ci ON sbr.region = ci.country_name where sbr.tenant_id=#{dto.tenantId} - and sbr.deleted = 0 + + and deleted = 1 + + + and deleted = 0 + + + and deleted = 0 + or deleted = 1 + 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 53f1f0e..ba234fd 100644 --- a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml @@ -252,7 +252,16 @@ yesterday_coins,ns.create_time, country, online_fans,hosts_kind,remake ,operation_status,user_id,uid,ns.update_time,ns.flag,ns.country_eng from server_employee_hosts ns left join server_country_info ci ON ns.country = ci.country_name WHERE tenant_id = #{req.tenantId,jdbcType=BIGINT} - and deleted = 0 + + and deleted = 1 + + + and deleted = 0 + + + and deleted = 0 + or deleted = 1 + and user_id = #{req.userId,jdbcType=BIGINT}