From d2d8e62a7d1ebda035783c592f5c95cd031744b4 Mon Sep 17 00:00:00 2001
From: HuangHuiKang <HuangHuiKang@qq.com>
Date: Thu, 25 Jun 2026 15:50:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=85=B7?=
 =?UTF-8?q?=E7=BB=84=E8=AE=BE=E5=A4=87=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/mold/vo/MoldBrandPageReqVO.java      | 3 +++
 .../module/erp/service/mold/MoldBrandServiceImpl.java     | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java
index a2e2c28ff..684ada1b1 100644
--- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java
+++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java
@@ -50,6 +50,9 @@ public class MoldBrandPageReqVO extends PageParam {
     @Schema(description = "设备名称", example = "注塑机")
     private String deviceName;
 
+    @Schema(description = "当前设备，模糊匹配设备名称", example = "注塑机")
+    private String currentDevice;
+
     @Schema(description = "预期寿命(小时)")
     private BigDecimal useTime;
 
diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java
index cbd725a4e..92290552b 100644
--- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java
+++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java
@@ -215,6 +215,7 @@ public class MoldBrandServiceImpl implements MoldBrandService {
 
     @Override
     public PageResult<MoldBrandRespVO> getMoldBrandPage(MoldBrandPageReqVO pageReqVO) {
+        applyCurrentDeviceFilter(pageReqVO);
         if (StrUtil.isNotBlank(pageReqVO.getDeviceName())) {
             List<MoldBrandDO> filteredList = selectByDeviceName(pageReqVO);
             List<MoldBrandDO> pageList = paginateList(filteredList, pageReqVO);
@@ -241,6 +242,7 @@ public class MoldBrandServiceImpl implements MoldBrandService {
     @Override
     public MoldBrandStatusStatisticsRespVO getMoldBrandStatusStatistics(MoldBrandPageReqVO pageReqVO) {
         MoldBrandPageReqVO statisticsReqVO = BeanUtils.toBean(pageReqVO, MoldBrandPageReqVO.class);
+        applyCurrentDeviceFilter(statisticsReqVO);
         statisticsReqVO.setStatus(null);
         List<MoldBrandDO> list = StrUtil.isNotBlank(statisticsReqVO.getDeviceName())
                 ? selectByDeviceName(statisticsReqVO)
@@ -363,6 +365,12 @@ public class MoldBrandServiceImpl implements MoldBrandService {
         return latestOperateMap;
     }
 
+    private void applyCurrentDeviceFilter(MoldBrandPageReqVO reqVO) {
+        if (reqVO != null && StrUtil.isBlank(reqVO.getDeviceName()) && StrUtil.isNotBlank(reqVO.getCurrentDevice())) {
+            reqVO.setDeviceName(reqVO.getCurrentDevice());
+        }
+    }
+
     private void fillCurrentDeviceNameByLatestOperate(MoldBrandRespVO item, MoldOperateSimpleDO latestOperate) {
         if (latestOperate == null) {
             item.setDeviceName(null);