From 3ce8c1cfbf2b0a577c8fbb155128dc85c3857606 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 16 六月 2026 13:47:34 +0800
Subject: [PATCH] fix(approval): 修复审批实例创建中的业务ID和模板查询问题

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

diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index 15b56ea..721abad 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -180,8 +180,13 @@
         boolean save = this.add(req);
         // 鍙戣揣瀹℃壒
         ApprovalInstanceDto approvalInstance = new ApprovalInstanceDto();
-        approvalInstance.setTemplateId(approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>().eq(ApprovalTemplate::getBusinessType,6L).orderByDesc(ApprovalTemplate::getId).last("LIMIT 1")).getId());
-        approvalInstance.setTemplateName(approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>().eq(ApprovalTemplate::getBusinessType,6L).orderByDesc(ApprovalTemplate::getId).last("LIMIT 1")).getTemplateName());
+        ApprovalTemplate shippingTemplate = approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>()
+                .eq(ApprovalTemplate::getBusinessType, 7L)
+                .eq(ApprovalTemplate::getDeleted, 0)
+                .orderByDesc(ApprovalTemplate::getId)
+                .last("LIMIT 1"));
+        approvalInstance.setTemplateId(shippingTemplate.getId());
+        approvalInstance.setTemplateName(shippingTemplate.getTemplateName());
         approvalInstance.setBusinessId(req.getId());
         approvalInstance.setBusinessType(7L);
         approvalInstance.setCurrentLevel(1);

--
Gitblit v1.9.3