合并最新

This commit is contained in:
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
+1 -1
View File
@@ -1005,7 +1005,7 @@ namespace BLL
where (identityCard == null || x.IdentityCard == identityCard)
&& y.ContractNo == proCode && v.TeamId.HasValue
&& ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue && x.RealNameAddTime.HasValue)
|| (type != Const.BtnModify && !x.RealNameAddTime.HasValue && x.IsUsed && !x.OutTime.HasValue
|| (type != Const.BtnModify && !x.RealNameAddTime.HasValue && x.IsUsed==1 && !x.OutTime.HasValue
&& x.HeadImage != null && x.HeadImage.Length > 0))
&& x.IsCardNoOK == true && pu.IsSynchro == true && z.JTproCode != null
select new