修正列印牌位異常,修正報名新增功德項目,避免用到不存在的套表造成null pointer

This commit is contained in:
2026-08-10 15:18:40 +08:00
parent 68206fcab2
commit 700f92fcbc
2 changed files with 4 additions and 3 deletions
+3 -2
View File
@@ -1,4 +1,5 @@
using DocumentFormat.OpenXml.Drawing.Spreadsheet; using DocumentFormat.OpenXml.Drawing.Spreadsheet;
using Microsoft.Ajax.Utilities;
using MINOM.COM.Utility; using MINOM.COM.Utility;
using Model; using Model;
using Newtonsoft.Json; 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) ? (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), //預設金額,有活動抓活動預設,沒活動抓品項預設 price = (_activity_id > 0) ? (x.activity_relating.Select(o => o.price).FirstOrDefault() ?? x.price) : (x.price), //預設金額,有活動抓活動預設,沒活動抓品項預設
customize_data = x.customize_data ?? "", 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, num = f.file.num,
subject = f.file.subject, subject = f.file.subject,
word = f.file.word, word = f.file.word,
cuz_column = f.file.customize_data ?? "", //定義欄位需求 cuz_column = f.file.customize_data ?? "", //定義欄位需求
}), }):null,
}), }),
count = count count = count
}; };
+1 -1
View File
@@ -422,7 +422,7 @@
// 處理極端情況 // 處理極端情況
if (sizes.length === 0) { if (sizes.length === 0) {
sizes = names.map(name => { sizes = mid.map(name => {
return { name: name, size: 12, isMulti: (name.length * 12 * 1.333) > th }; return { name: name, size: 12, isMulti: (name.length * 12 * 1.333) > th };
}); });
} }