From 700f92fcbcc01a304e3966580cfee9ab47f1db3c Mon Sep 17 00:00:00 2001 From: minom Date: Mon, 10 Aug 2026 15:18:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=97=E5=8D=B0=E7=89=8C?= =?UTF-8?q?=E4=BD=8D=E7=95=B0=E5=B8=B8=EF=BC=8C=E4=BF=AE=E6=AD=A3=E5=A0=B1?= =?UTF-8?q?=E5=90=8D=E6=96=B0=E5=A2=9E=E5=8A=9F=E5=BE=B7=E9=A0=85=E7=9B=AE?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E7=94=A8=E5=88=B0=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=9A=84=E5=A5=97=E8=A1=A8=E9=80=A0=E6=88=90null=20po?= =?UTF-8?q?inter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/App_Code/api/activityController.cs | 5 +++-- web/admin/print/print_multi_new.aspx | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/App_Code/api/activityController.cs b/web/App_Code/api/activityController.cs index 93661c7..4ab3294 100644 --- a/web/App_Code/api/activityController.cs +++ b/web/App_Code/api/activityController.cs @@ -1,4 +1,5 @@ using DocumentFormat.OpenXml.Drawing.Spreadsheet; +using Microsoft.Ajax.Utilities; using MINOM.COM.Utility; using Model; using Newtonsoft.Json; @@ -824,13 +825,13 @@ public class activityController : ApiController //price = (_activity_id > 0) ? (relatingDt.Where(o => o.actItem_num == x.num).Select(o => o.price).FirstOrDefault()?? x.price) : (x.price ) , //預設金額,有活動抓活動預設,沒活動抓品項預設 price = (_activity_id > 0) ? (x.activity_relating.Select(o => o.price).FirstOrDefault() ?? x.price) : (x.price), //預設金額,有活動抓活動預設,沒活動抓品項預設 customize_data = x.customize_data ?? "", - files = x.actItem_files.Select(f => new + files =x.actItem_files!=null? x.actItem_files.Select(f => new { num = f.file.num, subject = f.file.subject, word = f.file.word, cuz_column = f.file.customize_data ?? "", //定義欄位需求 - }), + }):null, }), count = count }; diff --git a/web/admin/print/print_multi_new.aspx b/web/admin/print/print_multi_new.aspx index cba1b57..f35b812 100644 --- a/web/admin/print/print_multi_new.aspx +++ b/web/admin/print/print_multi_new.aspx @@ -422,7 +422,7 @@ // 處理極端情況 if (sizes.length === 0) { - sizes = names.map(name => { + sizes = mid.map(name => { return { name: name, size: 12, isMulti: (name.length * 12 * 1.333) > th }; }); }