zhengcaioa.git - Gitblit

			@@ -24,9 +24,11 @@
			private readonly ILiaotianService _liaotianService;
			private readonly IPltJiatingchengyuanService _pltJiatingchengyuanService;
			private readonly ISysAttachmentService _sysAttachmentService;
			private readonly IPltRoleService _pltRoleService;


			public UserController(ILogger<UserController> logger, IUserService userService, IHrDeptService hrDeptService, IHrPositionService hrPositionService, ILiaotianService liaotianService, IPltJiatingchengyuanService pltJiatingchengyuanService, ISysAttachmentService sysAttachmentService)
			public UserController(ILogger<UserController> logger, IUserService userService, IHrDeptService hrDeptService, IHrPositionService hrPositionService, ILiaotianService liaotianService, IPltJiatingchengyuanService pltJiatingchengyuanService, ISysAttachmentService sysAttachmentService
			, IPltRoleService pltRoleService)
			{
			_logger = logger;
			_userService = userService;
			@@ -35,6 +37,7 @@
			_liaotianService = liaotianService;
			_pltJiatingchengyuanService = pltJiatingchengyuanService;
			_sysAttachmentService = sysAttachmentService;
			_pltRoleService = pltRoleService;
			}


			@@ -259,16 +262,17 @@

			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;
			userdata.RecStatus = "A";
			if (String.IsNullOrEmpty(userdata.Id))
			{
			userdata.Creater = curentuser.Id;
			userdata.Createtime = DateTime.Now;
			charujues = true;
			}
			userdata.Modifier = curentuser.Id;
			userdata.Modifytime = DateTime.Now;
			@@ -278,6 +282,21 @@
			{
			return JsonConvert.SerializeObject(resultEntity);
			}
			if (charujues)
			{
			var pltRoleDTO = _pltRoleService.listRole().Where(x => x.RoleName == "员工").FirstOrDefault();

			if (pltRoleDTO != null)
			{
			resultEntity = _pltRoleService.SaveUserRole(pltRoleDTO.Id,userdata.Id, curentuser.Id);
			if (resultEntity.Result == false)
			{
			return JsonConvert.SerializeObject(resultEntity);
			}
			}

			}

			string[] JiatingchengyuanId = userdata.JiatingchengyuanId;
			string[] Name = userdata.Name;
			string[] Guanxi = userdata.Guanxi;
			@@ -336,11 +355,11 @@
			}
			scope.Complete();
			}
			}
			else
			{
			resultEntity.Message = "MAC地址格式错误";
			}
			//}
			//else
			//{
			// resultEntity.Message = "MAC地址格式错误";
			//}
			return JsonConvert.SerializeObject(resultEntity);
			}
			#endregion
			@@ -454,6 +473,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]