From 0481b3942353f83c8506d77a0fc1a447a6942763 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 20 七月 2026 18:52:58 +0800
Subject: [PATCH] fix: 设备保养和巡检定时任务修改

---
 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index 6008e69..e423400 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -621,8 +621,13 @@
             return;
         }
         ApprovalInstanceDto approvalInstance = new ApprovalInstanceDto();
-        approvalInstance.setTemplateId(approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>().eq(ApprovalTemplate::getBusinessType,5L).orderByDesc(ApprovalTemplate::getId).last("LIMIT 1")).getId());
-        approvalInstance.setTemplateName(approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>().eq(ApprovalTemplate::getBusinessType,5L).orderByDesc(ApprovalTemplate::getId).last("LIMIT 1")).getTemplateName());
+        ApprovalTemplate purchaseTemplate = approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>()
+                .eq(ApprovalTemplate::getBusinessType, 5L)
+                .eq(ApprovalTemplate::getDeleted, 0)
+                .orderByDesc(ApprovalTemplate::getId)
+                .last("LIMIT 1"));
+        approvalInstance.setTemplateId(purchaseTemplate.getId());
+        approvalInstance.setTemplateName(purchaseTemplate.getTemplateName());
         approvalInstance.setBusinessId(purchaseLedger.getId());
         approvalInstance.setBusinessType(5L);
         approvalInstance.setCurrentLevel(1);

--
Gitblit v1.9.3