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)