diff --git a/YLErpDAL/Modules/TradeModule/TradeOAService.cs b/YLErpDAL/Modules/TradeModule/TradeOAService.cs index c93716f0..81d75378 100644 --- a/YLErpDAL/Modules/TradeModule/TradeOAService.cs +++ b/YLErpDAL/Modules/TradeModule/TradeOAService.cs @@ -262,6 +262,20 @@ namespace YLErp.Modules.TradeModule //通过UserName找到LoginName var applicantLoginName = DbContextFactory.GetErpBaseContext().SystemUsers.Where(u => u.Name == UserInfo.UserName).Select(u => u.LoginName).FirstOrDefault(); + // 构建detailList,yycl(应用场景/附件)放在明细列表中 + var detailList = new List(); + if (attachmentDataList != null && attachmentDataList.Any()) + { + foreach (var att in attachmentDataList) + { + detailList.Add(new + { + detailIndex = 1, + yycl = att + }); + } + } + // 构建dataMap var dataMap = new { @@ -295,8 +309,7 @@ namespace YLErp.Modules.TradeModule //是否签订廉洁协议 0已签 1未签 2无需签订 htbjjs = $"我司与{trade.ClientName}已完成NAFMII协议签署,并开展TRS交易:{contractCode},参与标的{trade.UnderlyingCode} {trade.UnderlyingName},参与标的数量面额{trade.OriginalStockEqvNotional}元人民币", //合同背景介绍 - // 使用附件数据列表(包含 annexId 和 annexName) - yycl = attachmentDataList?.FirstOrDefault(), + detailList = detailList.Any() ? detailList : null, creater = applicantLoginName };