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 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 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} - - and ns.hosts_id like concat(#{req.hostsId,jdbcType=VARCHAR},'%') + + AND ns.hosts_level IN + + #{level, jdbcType=VARCHAR} + - and ns.hosts_level =#{req.hostsLevel,jdbcType=VARCHAR} @@ -206,8 +208,11 @@ and ns.hosts_id like concat(#{req.hostsId,jdbcType=VARCHAR},'%') - - and ns.hosts_level =#{req.hostsLevel,jdbcType=VARCHAR} + + AND ns.hosts_level IN + + #{level, jdbcType=VARCHAR} + 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} - - and ns.hosts_level =#{req.hostsLevel,jdbcType=VARCHAR} + + AND ns.hosts_level IN + + #{level, jdbcType=VARCHAR} + and ns.ai_operation = #{req.aiOperation,jdbcType=TINYINT}