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());