From 35622cdcf520ebd7b2ace395adfa4e190d1c4a4f Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 18 May 2026 16:08:13 +0800
Subject: [PATCH] =?UTF-8?q?1.1.43=20=E5=90=88=E5=90=8C=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=87=8C=E5=A4=87=E6=B3=A8=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E2=80=9C?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E2=80=9D=E4=BA=8C=E5=AD=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TemplateVariableAssignServiceImpl.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/TemplateVariableAssignServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/TemplateVariableAssignServiceImpl.java
index c0079c01..a2b45319 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/TemplateVariableAssignServiceImpl.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/TemplateVariableAssignServiceImpl.java
@@ -111,6 +111,15 @@ public class TemplateVariableAssignServiceImpl implements ITemplateVariableAssig
                     .collect(Collectors.joining("\n"));
             contractInfo.setPaymentMethodDetails(paymentMethodDetails);
         }
+        // 合同物料备注：有值时前缀「备注：」
+        if (StringUtils.isNotBlank(contractInfo.getMaterialRemark())) {
+            String remark = contractInfo.getMaterialRemark().trim();
+            if (!remark.startsWith("备注：")) {
+                contractInfo.setMaterialRemark("备注：" + remark);
+            } else {
+                contractInfo.setMaterialRemark(remark);
+            }
+        }
         // 为所有模板变量赋值
         return buildAssignResultList(allTemplateVariables, variableMap, contractInfo, contractMaterials);
     }