licq/chem_mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(data): 修复数据查询中删除标记的过滤逻辑

Browse Source
This commit is contained in:
zxy 2026-04-08 17:50:54 +08:00
parent 59c9c75298
commit 686bc8a4e3
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java
View File

@ -66,7 +66,7 @@ public class MachineServiceImpl extends ServiceImpl<MachineMapper, MachineEntity
if (ObjectUtil.isNotEmpty(machinePagination.getBelgProcId())) { if (ObjectUtil.isNotEmpty(machinePagination.getBelgProcId())) {
machineWrapper.eq(MachineEntity::getBelgProcId, machinePagination.getBelgProcId()); machineWrapper.eq(MachineEntity::getBelgProcId, machinePagination.getBelgProcId());
} }
// machineWrapper.isNull(MachineEntity::getDeleteMark); machineWrapper.isNull(MachineEntity::getDeleteMark);
machineWrapper.orderByDesc(MachineEntity::getCreatorTime); machineWrapper.orderByDesc(MachineEntity::getCreatorTime);
if ("0".equals(machinePagination.getDataType())) { if ("0".equals(machinePagination.getDataType())) {
Page<MachineEntity> page = new Page<>(machinePagination.getCurrentPage(), machinePagination.getPageSize()); Page<MachineEntity> page = new Page<>(machinePagination.getCurrentPage(), machinePagination.getPageSize());

1
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java
View File

@ -48,6 +48,7 @@ public class ProLineServiceImpl extends ServiceImpl<ProLineMapper, ProLineEntity
if (ObjectUtil.isNotEmpty(proLinePagination.getEnabledStatus())) { if (ObjectUtil.isNotEmpty(proLinePagination.getEnabledStatus())) {
proLineWrapper.eq(ProLineEntity::getEnabledStatus, proLinePagination.getEnabledStatus()); proLineWrapper.eq(ProLineEntity::getEnabledStatus, proLinePagination.getEnabledStatus());
} }
proLineWrapper.isNull(ProLineEntity::getDeleteMark);
proLineWrapper.orderByDesc(ProLineEntity::getCreatorTime); proLineWrapper.orderByDesc(ProLineEntity::getCreatorTime);
if ("0".equals(proLinePagination.getDataType())) { if ("0".equals(proLinePagination.getDataType())) {
Page<ProLineEntity> page = new Page<>(proLinePagination.getCurrentPage(), proLinePagination.getPageSize()); Page<ProLineEntity> page = new Page<>(proLinePagination.getCurrentPage(), proLinePagination.getPageSize());

1
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProcServiceImpl.java
View File

@ -51,6 +51,7 @@ public class ProcServiceImpl extends ServiceImpl<ProcMapper, ProcEntity> impleme
if (ObjectUtil.isNotEmpty(procPagination.getEnabledStatus())) { if (ObjectUtil.isNotEmpty(procPagination.getEnabledStatus())) {
procWrapper.eq(ProcEntity::getEnabledStatus, procPagination.getEnabledStatus()); procWrapper.eq(ProcEntity::getEnabledStatus, procPagination.getEnabledStatus());
} }
procWrapper.isNull(ProcEntity::getDeleteMark);
procWrapper.orderByDesc(ProcEntity::getCreatorTime); procWrapper.orderByDesc(ProcEntity::getCreatorTime);
if ("0".equals(procPagination.getDataType())) { if ("0".equals(procPagination.getDataType())) {
Page<ProcEntity> page = new Page<>(procPagination.getCurrentPage(), procPagination.getPageSize()); Page<ProcEntity> page = new Page<>(procPagination.getCurrentPage(), procPagination.getPageSize());