From 686bc8a4e3bd31e62eb6373b14b1a834ba8c6e59 Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Wed, 8 Apr 2026 17:50:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(data):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E4=B8=AD=E5=88=A0=E9=99=A4=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E7=9A=84=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/jnpf/service/impl/MachineServiceImpl.java     | 2 +-
 .../src/main/java/jnpf/service/impl/ProLineServiceImpl.java     | 1 +
 .../src/main/java/jnpf/service/impl/ProcServiceImpl.java        | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java
index fa20ad2..96f1ff5 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java
@@ -66,7 +66,7 @@ public class MachineServiceImpl extends ServiceImpl<MachineMapper, MachineEntity
         if (ObjectUtil.isNotEmpty(machinePagination.getBelgProcId())) {
             machineWrapper.eq(MachineEntity::getBelgProcId, machinePagination.getBelgProcId());
         }
-//        machineWrapper.isNull(MachineEntity::getDeleteMark);
+        machineWrapper.isNull(MachineEntity::getDeleteMark);
         machineWrapper.orderByDesc(MachineEntity::getCreatorTime);
         if ("0".equals(machinePagination.getDataType())) {
             Page<MachineEntity> page = new Page<>(machinePagination.getCurrentPage(), machinePagination.getPageSize());
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java
index 23a491b..4737859 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java
@@ -48,6 +48,7 @@ public class ProLineServiceImpl extends ServiceImpl<ProLineMapper, ProLineEntity
         if (ObjectUtil.isNotEmpty(proLinePagination.getEnabledStatus())) {
             proLineWrapper.eq(ProLineEntity::getEnabledStatus, proLinePagination.getEnabledStatus());
         }
+        proLineWrapper.isNull(ProLineEntity::getDeleteMark);
         proLineWrapper.orderByDesc(ProLineEntity::getCreatorTime);
         if ("0".equals(proLinePagination.getDataType())) {
             Page<ProLineEntity> page = new Page<>(proLinePagination.getCurrentPage(), proLinePagination.getPageSize());
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProcServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProcServiceImpl.java
index 591dcb1..f350b3a 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProcServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProcServiceImpl.java
@@ -51,6 +51,7 @@ public class ProcServiceImpl extends ServiceImpl<ProcMapper, ProcEntity> impleme
         if (ObjectUtil.isNotEmpty(procPagination.getEnabledStatus())) {
             procWrapper.eq(ProcEntity::getEnabledStatus, procPagination.getEnabledStatus());
         }
+        procWrapper.isNull(ProcEntity::getDeleteMark);
         procWrapper.orderByDesc(ProcEntity::getCreatorTime);
         if ("0".equals(procPagination.getDataType())) {
             Page<ProcEntity> page = new Page<>(procPagination.getCurrentPage(), procPagination.getPageSize());