From 6f34ab1ed6f8cb79a012a30a7b687e362c6f16c2 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期四, 10 六月 2021 19:08:41 +0800
Subject: [PATCH] 打卡判断，增加前端浏览器mac获取，当mac获取为空时不判断
---
zhengcaioa/Services/DailyManagementService.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/DailyManagementService.cs b/zhengcaioa/Services/DailyManagementService.cs
index a6340e3..b8ecd87 100644
--- a/zhengcaioa/Services/DailyManagementService.cs
+++ b/zhengcaioa/Services/DailyManagementService.cs
@@ -236,6 +236,7 @@
Creater = c.UserName,
ToUserId = b.UserName,
Time = a.Time,
+ TimeName = a.Time.HasValue ? a.Time.Value.ToString("yyyy-MM-dd HH:mm") : "",
Context = a.Context,
Createtime = a.Createtime,
FeedBack = a.FeedBack,
@@ -251,7 +252,7 @@
HaveRead = a.HaveRead.HasValue? a.HaveRead.Value:0,
HaveReadName = hhh.Comments,
- }).OrderByDescending(x=>x.Time).ToList();
+ }).OrderByDescending(x=>x.Createtime).ToList();
//if (!string.IsNullOrEmpty(search.Createtime))
//{
--
Gitblit v1.9.1