From 2369258bc0b452cf3cab2dd5e8e2d9fde112b8d0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 26 七月 2021 16:17:25 +0800
Subject: [PATCH] 今日开发 加班申请· 统计报表：没有任何工作的人，不显示。显示人员的 部门 职位 姓名 工作时间 在计算考勤的时候只有有加班申请的加班才算加班
---
zhengcaioa/zhengcaioa/Controllers/UserController.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/UserController.cs b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
index 2f1cabc..1f55740 100644
--- a/zhengcaioa/zhengcaioa/Controllers/UserController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
@@ -262,8 +262,8 @@
string s = @"^([A-Fa-f0-9]{2}[-,:]){5}[A-Fa-f0-9]{2}$";
Regex rStr = new Regex(s);
- if (rStr.IsMatch(userdata.IpMac))
- {
+ //if (rStr.IsMatch(userdata.IpMac))
+ //{
using (TransactionScope scope = new TransactionScope())
{
bool charujues = false;
@@ -355,11 +355,11 @@
}
scope.Complete();
}
- }
- else
- {
- resultEntity.Message = "MAC鍦板潃鏍煎紡閿欒";
- }
+ //}
+ //else
+ //{
+ // resultEntity.Message = "MAC鍦板潃鏍煎紡閿欒";
+ //}
return JsonConvert.SerializeObject(resultEntity);
}
#endregion
--
Gitblit v1.9.1