操作日志列表新增业务类型显示

ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs

@@ -42,7 +42,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor
 
             var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo);
 
-            return ToResponse(ToJson(list.TotalNum, list), TIME_FORMAT_FULL_2);
+            return ToResponse(ToJson(list.TotalNum, list), "MM/dd HH:mm");
         }
 
         /// <summary>

ZR.Model/System/SysOperLog.cs

@@ -69,16 +69,16 @@ namespace ZR.Model.System
         //@Excel(name = "状态", readConverterExp = "0=正常,1=异常")
         public int status { get; set; }
 
-        /** 错误消息 */
-        //@Excel(name = "错误消息")
+        /// <summary>
+        /// 错误消息
+        /// </summary>
+        [EpplusTableColumn(Header = "错误消息")]
         public string errorMsg { get; set; }
 
-        /** 操作时间 */
-        //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-        //@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-        //[DataType]
-        [JsonConverter(typeof(JsonDateConverter))]
-        [EpplusTableColumn(NumberFormat = "yyyy-MM-dd HH:mm:ss")]
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        [EpplusTableColumn(Header = "操作时间", NumberFormat = "yyyy-MM-dd HH:mm:ss")]
         public DateTime? operTime { get; set; }
         /// <summary>
         /// 操作用时

ZR.Service/System/SysOperLogService.cs

@@ -43,6 +43,11 @@ namespace ZR.Service.System
             operLog.BeginTime = DateTimeHelper.GetBeginTime(operLog.BeginTime, -1);
             operLog.EndTime = DateTimeHelper.GetBeginTime(operLog.EndTime, 1);
 
+            bool isDemoMode = AppSettings.GetAppConfig("DemoMode", false);
+            if (isDemoMode)
+            {
+                return new PagedInfo<SysOperLog>();
+            }
             var list = sysOperLogRepository.GetSysOperLog(operLog, pager);
 
             return list;