From ca48a154bd224f948e2d812a3dbad2eb302b1bf1 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Thu, 18 Dec 2025 18:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A3=85=E5=A4=87=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=85=8D=E7=BD=AE=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approval/service/impl/ApprovalEngineServiceImpl.java    | 5 +----
 .../bonus/material/devConfig/domain/EquipmentTypeQuery.java | 1 +
 .../mapper/material/devConfig/EquipmentTypeMapper.xml       | 6 ++++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/service/impl/ApprovalEngineServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/service/impl/ApprovalEngineServiceImpl.java
index 1693a75..26a6766 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/service/impl/ApprovalEngineServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/service/impl/ApprovalEngineServiceImpl.java
@@ -242,18 +242,15 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
      */
     private AjaxResult handlePass(ApprovalInstance instance, ApprovalNode currentNode) {
         // 查询下一个节点
-        ApprovalNode nextNode = nodeMapper.selectNodeByOrder(
-                instance.getProcessId(), currentNode.getNodeOrder() + 1);
+        ApprovalNode nextNode = nodeMapper.selectNodeByOrder(instance.getProcessId(), currentNode.getNodeOrder() + 1);
 
         if (nextNode == null) {
             // 没有下一个节点，审批流程结束
             instanceMapper.updateInstanceStatus(instance.getId(), ApprovalStatusEnum.APPROVED.getCode());
-
             log.info("审批实例[{}]审批通过", instance.getInstanceCode());
 
             // 执行通过回调
             executeCallback(instance, ApprovalStatusEnum.APPROVED.getCode());
-
             return AjaxResult.success("审批通过，流程结束");
         } else {
             // 流转到下一个节点
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/domain/EquipmentTypeQuery.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/domain/EquipmentTypeQuery.java
index c9fd306..fb493f2 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/domain/EquipmentTypeQuery.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/domain/EquipmentTypeQuery.java
@@ -16,6 +16,7 @@ import lombok.Data;
  */
 @Data
 public class EquipmentTypeQuery {
+    private String deviceName;
     private Long parentId;
     private String typeName;
     private String status;
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentTypeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentTypeMapper.xml
index 711ea4a..5755de1 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentTypeMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentTypeMapper.xml
@@ -21,6 +21,9 @@
         SELECT <include refid="Base_Column_List" />
         FROM ma_type
         <where>
+            <if test="deviceName != null and deviceName != '' ">
+                AND type_name LIKE CONCAT('%', #{deviceName}, '%')
+            </if>
             <if test="parentId != null">
                 AND parent_id = #{parentId}
             </if>
@@ -39,6 +42,9 @@
         SELECT COUNT(*)
         FROM ma_type
         <where>
+            <if test="deviceName != null and deviceName != '' ">
+                AND type_name LIKE CONCAT('%', #{deviceName}, '%')
+            </if>
             <if test="parentId != null">
                 AND parent_id = #{parentId}
             </if>