From 9d463353918b5a994ef11824b86f85aa3c1c7f0c Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Thu, 2 Jul 2026 10:06:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E6=89=AB=E7=A0=81=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dvrepair/DvRepairServiceImpl.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java index bd97d1519..8a38f101c 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java @@ -159,12 +159,22 @@ public class DvRepairServiceImpl implements DvRepairService { } if (StringUtils.isNotBlank(pageReqVO.getKeyword())) { + String keyword = pageReqVO.getKeyword().trim(); + pageReqVO.setKeyword(keyword); LambdaQueryWrapperX keywordDeviceQuery = new LambdaQueryWrapperX<>(); - keywordDeviceQuery.and(w -> w - .like(DeviceLedgerDO::getDeviceCode, pageReqVO.getKeyword()) - .or() - .like(DeviceLedgerDO::getDeviceName, pageReqVO.getKeyword()) - ); + if (keyword.startsWith("EQUIPMENT-")) { + try { + keywordDeviceQuery.eq(DeviceLedgerDO::getId, Long.valueOf(keyword.substring("EQUIPMENT-".length()))); + } catch (NumberFormatException e) { + keywordDeviceQuery.eq(DeviceLedgerDO::getId, -1L); + } + } else { + keywordDeviceQuery.and(w -> w + .like(DeviceLedgerDO::getDeviceCode, keyword) + .or() + .like(DeviceLedgerDO::getDeviceName, keyword) + ); + } List deviceLedgerDOS = deviceLedgerMapper.selectList(keywordDeviceQuery); pageReqVO.setKeywordMachineryIds(deviceLedgerDOS.stream() .map(DeviceLedgerDO::getId)