From 8a286d8dd894be550bd0ce9fd859781f98478747 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 20 七月 2021 15:15:04 +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