From f1118520a91107226edde828acb55059fc258d35 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 31 Oct 2023 18:28:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/Model/Model.cs | 48 ++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index eb8267c4..8d6b7742 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -59742,8 +59742,6 @@ namespace Model
 		
 		private string _CheckItemSetId;
 		
-		private string _ReceiveMan;
-		
 		private string _ResponsibleUnit;
 		
 		private string _WorkAreaId;
@@ -59752,6 +59750,8 @@ namespace Model
 		
 		private string _ResponsibleMan;
 		
+		private string _ReceiveMan;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
@@ -59792,8 +59792,6 @@ namespace Model
     partial void OnPartInPersonNamesChanged();
     partial void OnCheckItemSetIdChanging(string value);
     partial void OnCheckItemSetIdChanged();
-    partial void OnReceiveManChanging(string value);
-    partial void OnReceiveManChanged();
     partial void OnResponsibleUnitChanging(string value);
     partial void OnResponsibleUnitChanged();
     partial void OnWorkAreaIdChanging(string value);
@@ -59802,6 +59800,8 @@ namespace Model
     partial void OnQuestionTypeChanged();
     partial void OnResponsibleManChanging(string value);
     partial void OnResponsibleManChanged();
+    partial void OnReceiveManChanging(string value);
+    partial void OnReceiveManChanged();
     #endregion
 		
 		public Check_CheckSpecial()
@@ -60139,26 +60139,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveMan", DbType="NVarChar(2000)")]
-		public string ReceiveMan
-		{
-			get
-			{
-				return this._ReceiveMan;
-			}
-			set
-			{
-				if ((this._ReceiveMan != value))
-				{
-					this.OnReceiveManChanging(value);
-					this.SendPropertyChanging();
-					this._ReceiveMan = value;
-					this.SendPropertyChanged("ReceiveMan");
-					this.OnReceiveManChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleUnit", DbType="NVarChar(50)")]
 		public string ResponsibleUnit
 		{
@@ -60239,6 +60219,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveMan", DbType="NVarChar(2000)")]
+		public string ReceiveMan
+		{
+			get
+			{
+				return this._ReceiveMan;
+			}
+			set
+			{
+				if ((this._ReceiveMan != value))
+				{
+					this.OnReceiveManChanging(value);
+					this.SendPropertyChanging();
+					this._ReceiveMan = value;
+					this.SendPropertyChanged("ReceiveMan");
+					this.OnReceiveManChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{

From a113dc2b4ba382dfed9927d438539365c5a8ae35 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 2 Nov 2023 10:24:07 +0800
Subject: [PATCH 2/3] =?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

---
 .../HSSE/SecuritySystem/SafetyOrganization.aspx.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SGGL/FineUIPro.Web/HSSE/SecuritySystem/SafetyOrganization.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SecuritySystem/SafetyOrganization.aspx.cs
index 992291c7..465f1c0e 100644
--- a/SGGL/FineUIPro.Web/HSSE/SecuritySystem/SafetyOrganization.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SecuritySystem/SafetyOrganization.aspx.cs
@@ -119,7 +119,7 @@ namespace FineUIPro.Web.HSSE.SecuritySystem
             string strSql = @"SELECT p.PersonId,p.CardNo,p.PersonName,p.ProjectId,p.UnitId,w.WorkPostName,p.Telephone,w.Remark"
                           + @" FROM SitePerson_Person AS P"
                           + @" LEFT JOIN  Base_WorkPost AS W ON P.WorkPostId =W.WorkPostId"
-                          + @" WHERE w.PostType='1' AND p.ProjectId= '" + this.ProjectId + "' AND p.UnitId='" + unitIdSelect + "'";
+                          + @" WHERE w.PostType='1' AND p.ProjectId= '" + this.ProjectId + "' AND p.UnitId='" + unitIdSelect + "' and P.IsUsed=1 and P.OutTime is null";
             List<SqlParameter> listStr = new List<SqlParameter>();
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

From f31e39be20ae0d9f4200f105326f29645544c028 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 2 Nov 2023 14:42:03 +0800
Subject: [PATCH 3/3] =?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/BLL/BLL.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 578500cd..141cd945 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -1016,7 +1016,7 @@
       <Version>2.1.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.3</Version>
+      <Version>12.0.1</Version>
     </PackageReference>
     <PackageReference Include="NPOI">
       <Version>2.5.5</Version>