From adf58ddc0337678c2a6770fe8687e54a44998c0d Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期三, 02 四月 2025 15:43:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java index 8495ef1..f43eafa 100644 --- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java +++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java @@ -52,8 +52,9 @@ @PreAuthorize("@pms.hasPermission('device_deviceLeasingLedger_view')" ) public R getDeviceLeasingLedgerPage(@ParameterObject Page page, @ParameterObject DeviceLeasingLedger deviceLeasingLedger) { LambdaQueryWrapper<DeviceLeasingLedger> wrapper = Wrappers.lambdaQuery(); - wrapper.eq(StrUtil.isNotBlank(deviceLeasingLedger.getContractCode()),DeviceLeasingLedger::getContractCode,deviceLeasingLedger.getContractCode()); - wrapper.eq(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerCode()),DeviceLeasingLedger::getLedgerCode,deviceLeasingLedger.getLedgerCode()); + wrapper.like(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerName()),DeviceLeasingLedger::getLedgerName,deviceLeasingLedger.getLedgerName()); + wrapper.like(StrUtil.isNotBlank(deviceLeasingLedger.getContractCode()),DeviceLeasingLedger::getContractCode,deviceLeasingLedger.getContractCode()); + wrapper.like(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerCode()),DeviceLeasingLedger::getLedgerCode,deviceLeasingLedger.getLedgerCode()); wrapper.orderByDesc(DeviceLeasingLedger::getCreateTime); return R.ok(deviceLeasingLedgerService.page(page, wrapper)); } -- Gitblit v1.9.1