zhengcaioa.git - Gitblit

			@@ -142,6 +142,10 @@
			{
			PltUserDTO.ShebaodateName = PltUserDTO.Shebaodate.Value.ToString("yyyy-MM-dd");
			}
			if (PltUserDTO.HetongDateEnd.HasValue)
			{
			PltUserDTO.HetongDateEndName = PltUserDTO.HetongDateEnd.Value.ToString("yyyy-MM-dd");
			}
			if (PltUserDTO.ShiyongDate.HasValue)
			{
			PltUserDTO.ShiyongDateName = PltUserDTO.ShiyongDate.Value.ToString("yyyy-MM-dd");
			@@ -262,8 +266,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 +359,11 @@
			}
			scope.Complete();
			}
			}
			else
			{
			resultEntity.Message = "MAC地址格式错误";
			}
			//}
			//else
			//{
			// resultEntity.Message = "MAC地址格式错误";
			//}
			return JsonConvert.SerializeObject(resultEntity);
			}
			#endregion
			@@ -473,6 +477,16 @@
			return View();
			}

			[CheckLogin]
			public string GetUserListJiBenGongZi(PltUserDTOSearch search)
			{
			var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
			ViewData["curentuser"] = curentuser;
			search.Zhiwustatus = "A";
			//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
			return JsonConvert.SerializeObject(_userService.SearchByPaging(search));
			}


			#region 修改备注
			[CheckLogin]