From 71e1e85bd5478907308e547a08388ee8feace004 Mon Sep 17 00:00:00 2001 From: liutao <790864623@qq.com> Date: Mon, 8 Jun 2026 14:12:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/deviceledger/DeviceLedgerMapper.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/deviceledger/DeviceLedgerMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/deviceledger/DeviceLedgerMapper.java index aff40f994..9a78c77c7 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/deviceledger/DeviceLedgerMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/deviceledger/DeviceLedgerMapper.java @@ -24,11 +24,15 @@ public interface DeviceLedgerMapper extends BaseMapperX { LambdaQueryWrapperX deviceLedgerDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>(); if(StringUtils.isNotBlank(reqVO.getDeviceCode())&&StringUtils.isNotBlank(reqVO.getDeviceName())&&reqVO.getDeviceCode().equals(reqVO.getDeviceName())){ - deviceLedgerDOLambdaQueryWrapperX.and(w -> w - .like(DeviceLedgerDO::getDeviceCode, reqVO.getDeviceCode()) - .or() - .like(DeviceLedgerDO::getDeviceName, reqVO.getDeviceName()) - ); + if(reqVO.getDeviceCode().contains("EQUIPMENT-")){ + deviceLedgerDOLambdaQueryWrapperX.eq(DeviceLedgerDO::getId, reqVO.getDeviceCode().replace("EQUIPMENT-","")); + }else{ + deviceLedgerDOLambdaQueryWrapperX.and(w -> w + .like(DeviceLedgerDO::getDeviceCode, reqVO.getDeviceCode()) + .or() + .like(DeviceLedgerDO::getDeviceName, reqVO.getDeviceName()) + ); + } }else{ deviceLedgerDOLambdaQueryWrapperX.likeIfPresent(DeviceLedgerDO::getDeviceCode, reqVO.getDeviceCode()) .likeIfPresent(DeviceLedgerDO::getDeviceName, reqVO.getDeviceName());