From 507c540eed466aaabfc543c8a514596445d3a7af Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 10 四月 2026 14:44:34 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs"
index 45c1f1c..343c850 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs"
@@ -47,9 +47,10 @@
//tracklog_content = JsonConvert.SerializeObject(entity),
tracklog_content = entity is string strEntity ? strEntity : JsonConvert.SerializeObject(entity),//濡傛灉entity鏄瓧绗︿覆绫诲瀷锛屽垯鐩存帴浣跨敤锛屽惁鍒欏簭鍒楀寲涓篔SON瀛楃涓�
tracklog_createtime = DateTime.Now,
+ Creater = "system",
tracklog_type = content.Status ? "鎴愬姛" : "澶辫触",
tracklog_code = content.Status ? logCode : ("4" + logCode),
- tracklog_des = description,
+ tracklog_des = JsonConvert.SerializeObject(content),
tracklog_message = content.Status ? "" : content.Message,
tracklog_operator = "system"/*UserContext.Current.UserName*/
};
@@ -67,7 +68,16 @@
public override PageGridData<Dt_trackloginfo> GetPageData(PageDataOptions options)
{
- return base.GetPageData(options);
+ PageGridData<Dt_trackloginfo> car = null;
+ try
+ {
+ car = base.GetPageData(options);
+ }
+ catch (Exception ex)
+ {
+
+ }
+ return car;
}
--
Gitblit v1.9.3