diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java index 1859e5e..e7d94e8 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java @@ -79,7 +79,7 @@ public class ExampleOrderServiceImpl extends ServiceImpl page=new Page<>(exampleOrderPagination.getCurrentPage(), exampleOrderPagination.getPageSize()); @@ -140,6 +140,7 @@ public class ExampleOrderServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ExampleOrderEntity::getOrdType, ordType); - queryWrapper.eq(ExampleOrderEntity::getDeleteMark, null); + queryWrapper.eq(ExampleOrderEntity::getDeleteMark, "1"); queryWrapper.likeRight(ExampleOrderEntity::getSaleOrdNo, prefix + ym); queryWrapper.orderByDesc(ExampleOrderEntity::getSaleOrdNo); queryWrapper.last("LIMIT 1"); diff --git a/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue index 92f7cea..a4e5291 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue @@ -1030,7 +1030,7 @@ export default { } } let _data = this.dataForm - if (this.dataFormSubmitType == 0&&isDetail!='change') { + if (this.dataFormSubmitType == 0&&this.isDetail!='change') { _data.ordStatus=1 }else { _data.ordStatus=2