diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml index 9be1d82ca..f2a76d342 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mapper/FactoryNodePushMapper.xml @@ -4,9 +4,11 @@ diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java index ae1927d17..8047d8bc1 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java @@ -3,6 +3,7 @@ package com.logpm.factorydata.mengtian.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; @@ -39,6 +40,12 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl pageNodePush(FactoryNodePushEntity vo, Query query) { IPage page = Condition.getPage(query); QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, FactoryNodePushEntity.class); + if(StrUtil.isNotEmpty(vo.getType())){ + queryWrapper.eq("type", vo.getType()); + } + if(StrUtil.isNotEmpty(vo.getSendStatus())){ + queryWrapper.eq("send_status", vo.getSendStatus()); + } List deliveryTrainPage = baseMapper.pageNodePush(page, queryWrapper); return page.setRecords(deliveryTrainPage); }