From a03d31aa72680fcd0a196bc9b601b7232b635fbf Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Thu, 25 Jul 2024 18:33:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?=
 =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factorydata/mengtian/mapper/FactoryNodePushMapper.xml | 8 +++++---
 .../mengtian/service/impl/FactoryNodePushServiceImpl.java | 7 +++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

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 @@
 
     <select id="pageNodePush" resultType="com.logpm.factorydata.mengtian.entity.FactoryNodePushEntity">
         select * from mt_factory_node_push
-        <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
-            ${ew.sqlSegment}
-        </if>
+        <where>
+            <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
+                ${ew.sqlSegment}
+            </if>
+        </where>
     </select>
 
     <update id="cancel">
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<FactoryNodePushM
     public IPage<FactoryNodePushEntity> pageNodePush(FactoryNodePushEntity vo, Query query) {
 		IPage<FactoryNodePushEntity> page = Condition.getPage(query);
 		QueryWrapper<FactoryNodePushEntity> 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<FactoryNodePushEntity> deliveryTrainPage = baseMapper.pageNodePush(page, queryWrapper);
 		return page.setRecords(deliveryTrainPage);
     }