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