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 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 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 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 page = new Page<>(procPagination.getCurrentPage(), procPagination.getPageSize());