From fc1f48f6cb2736bf03b7750563e5d9830d6fd4ba Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:49:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/smartor_ls_261103' into smartor_ls_261103
---
ruoyi-task/src/main/java/com/ruoyi/task/common/ScheduleSubtaskBuilder.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/common/ScheduleSubtaskBuilder.java b/ruoyi-task/src/main/java/com/ruoyi/task/common/ScheduleSubtaskBuilder.java
index fe9f494..ab115a0 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/common/ScheduleSubtaskBuilder.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/common/ScheduleSubtaskBuilder.java
@@ -79,7 +79,16 @@
// 妯℃澘锛歞etail 浼樺厛浜� task
if (detail.getTemplateid() != null) {
- subtask.setTemplateid(detail.getTemplateid());
+ // 鍏煎鍘嗗彶鏁版嵁锛氭槑缁� templateid 鍙兘鏄ā鏉垮簱ID锛屼笉鑳界洿鎺ヤ綔涓轰换鍔℃ā鏉縄D浣跨敤銆�
+ if ("2".equals(serviceTask.getType())
+ && String.valueOf(detail.getTemplateid()).equals(serviceTask.getLibtemplateid())
+ && serviceTask.getTemplateid() != null) {
+ log.warn("璁″垝鏄庣粏 templateid [{}] 鏄ā鏉垮簱ID锛屽凡鍥為��涓轰换鍔℃ā鏉縄D [{}], taskid={}, detailId={}",
+ detail.getTemplateid(), serviceTask.getTemplateid(), serviceTask.getTaskid(), detail.getId());
+ subtask.setTemplateid(serviceTask.getTemplateid());
+ } else {
+ subtask.setTemplateid(detail.getTemplateid());
+ }
subtask.setTemplatename(detail.getTemplatename());
}
if (detail.getLibtemplateid() != null) {
--
Gitblit v1.9.3