From a3a58429a92b8f729bc1f88391d27042255b377f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 14 十月 2026 12:20:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_海西州_惠牧' into dev_海西州_惠牧
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java
index 8605e9c..83d43ec 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java
@@ -23,6 +23,10 @@
.eqIfPresent(MesDvRepairDO::getResult, reqVO.getResult())
.eqIfPresent(MesDvRepairDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesDvRepairDO::getRequireDate, reqVO.getRequireDate())
+ // 鍙傛暟缁戝畾锛屾寜璁惧鍙拌处褰撳墠鍚嶇О妯＄硦鏌ヨ锛涘垪琛ㄤ笌瀵煎嚭鍏变韩鏉′欢銆�
+ .apply(cn.hutool.core.util.StrUtil.isNotBlank(reqVO.getMachineryName()),
+ "machinery_id IN (SELECT id FROM mes_dv_machinery WHERE deleted=0 AND name LIKE {0})",
+ "%" + cn.hutool.core.util.StrUtil.trimToEmpty(reqVO.getMachineryName()) + "%")
.orderByDesc(MesDvRepairDO::getId));
}
--
Gitblit v1.9.3