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); }