From e31c69eed6df7ecb9a17e018100b736e20678466 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 7 Aug 2024 09:53:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs | 8 ++++++--
SGGL/FineUIPro.Web/Web.config | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs
index ce3001b3..f6b7328c 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs
@@ -187,6 +187,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
ir = pds.Rows.Count;
if (pds != null && ir > 0)
{
+ var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
var units = from x in Funs.DB.Base_Unit
select x;
var cnProfessionals = from x in Funs.DB.Base_CNProfessional select x;
@@ -254,9 +255,12 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
result += "第" + (i + 2).ToString() + "行," + "身份证号码" + "," + "[" + col4 + "]已存在!" + "|";
}
- if (!IDCardValid.CheckIDCard(col4))
+ if (project.IsForeign == null || project.IsForeign == false)
{
- result += "第" + (i + 2).ToString() + "行," + "身份证号码" + "," + "[" + col4 + "]非法!" + "|";
+ if (!IDCardValid.CheckIDCard(col4))
+ {
+ result += "第" + (i + 2).ToString() + "行," + "身份证号码" + "," + "[" + col4 + "]非法!" + "|";
+ }
}
}
else
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index f50b26d3..963148f2 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -77,7 +77,7 @@
-
+