From 884e6a825427ef6511e7b7396635fe39c53f4fb4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 15 六月 2021 09:57:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Services/UserService.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/UserService.cs b/zhengcaioa/Services/UserService.cs
index 37529bc..9364f63 100644
--- a/zhengcaioa/Services/UserService.cs
+++ b/zhengcaioa/Services/UserService.cs
@@ -84,13 +84,21 @@
return resultEntity;
}
+ var checkNumber = _context.PltUsers.Where(x => x.Usernumber == pltUserDTO.Usernumber && x.RecStatus == "A" && x.Id != pltUserDTO.Id).FirstOrDefault();
+ if (checkNumber != null && (string.IsNullOrWhiteSpace(pltUserDTO.Id) || (!string.IsNullOrWhiteSpace(pltUserDTO.Id) && checkNumber.Id != pltUserDTO.Id)))
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "宸ュ彿閲嶅";
+ return resultEntity;
+ }
+
var checkPhone = _context.PltUsers.Where(x => x.Phone == pltUserDTO.Phone && x.RecStatus == "A" && x.Id != pltUserDTO.Id).FirstOrDefault();
if (checkPhone != null && (string.IsNullOrWhiteSpace(pltUserDTO.Id) || (!string.IsNullOrWhiteSpace(pltUserDTO.Id) && checkPhone.Id != pltUserDTO.Id)))
{
resultEntity.Result = false;
resultEntity.Message = "鐢ㄦ埛鎵嬫満鍙烽噸澶�";
return resultEntity;
- }
+ }
var checkIdcard = _context.PltUsers.Where(x => x.Idcard == pltUserDTO.Idcard && x.RecStatus == "A" && x.Id != pltUserDTO.Id).FirstOrDefault();
if (checkIdcard != null && (string.IsNullOrWhiteSpace(pltUserDTO.Id) || (!string.IsNullOrWhiteSpace(pltUserDTO.Id) && checkIdcard.Id != pltUserDTO.Id)))
@@ -99,7 +107,6 @@
resultEntity.Message = "鐢ㄦ埛韬唤璇佸彿閲嶅";
return resultEntity;
}
-
var pltUser = _mapper.Map<PltUser>(pltUserDTO);
if (String.IsNullOrEmpty(pltUser.Id))
@@ -169,6 +176,14 @@
updatepltUser.JzYoubian = pltUser.JzYoubian;
updatepltUser.HjYoubian = pltUser.HjYoubian;
+ updatepltUser.IpMac = pltUser.IpMac;
+ updatepltUser.Iswdenter = pltUser.Iswdenter;
+ updatepltUser.Isxmenter = pltUser.Isxmenter;
+ updatepltUser.Usernumber = pltUser.Usernumber;
+ updatepltUser.advancewages = pltUser.advancewages;
+ updatepltUser.miniyearsalary = pltUser.miniyearsalary;
+ updatepltUser.senioritywages = pltUser.senioritywages;
+ updatepltUser.Istravelsubsidy = pltUser.Istravelsubsidy;
}
_context.SaveChanges();
--
Gitblit v1.9.1