From f1786018e6440a984c81505f5efb37c4bfa61ce8 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Sun, 7 Dec 2025 11:07:14 +0800
Subject: [PATCH 1/2] 11

---
 SGGL/FineUIPro.Web/WorkBench.aspx           | 10 +++++++++-
 SGGL/Microsoft.PowerShell_profile.ps1       |  0
 SGGL/WebAPI/Controllers/PersonController.cs |  3 ++-
 SGGL/WebAPI/WebAPI.csproj.user              |  4 ++--
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 SGGL/Microsoft.PowerShell_profile.ps1

diff --git a/SGGL/FineUIPro.Web/WorkBench.aspx b/SGGL/FineUIPro.Web/WorkBench.aspx
index 0c93bf04..16f5b0e4 100644
--- a/SGGL/FineUIPro.Web/WorkBench.aspx
+++ b/SGGL/FineUIPro.Web/WorkBench.aspx
@@ -238,7 +238,12 @@
             success: function (response) {
                 console.log(response.d)
                 console.log($('#divdbyj'))
-                $('#divdbyj').html(response.d)
+                $('#divdbyj').html(response.d) 
+
+                setTimeout(function () {
+                    getToDo(1);
+                }, 60000);
+
             },
             error: function (xhr, status, error) {
                 console.log(error)
@@ -281,6 +286,9 @@
             }
 
         })
+
+       
+
         page(9, '.todo', 0)
         page(40, '.project', 2)
         page(30, '.note', 1)
diff --git a/SGGL/Microsoft.PowerShell_profile.ps1 b/SGGL/Microsoft.PowerShell_profile.ps1
new file mode 100644
index 00000000..e69de29b
diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/PersonController.cs
index 66da9b91..905a423a 100644
--- a/SGGL/WebAPI/Controllers/PersonController.cs
+++ b/SGGL/WebAPI/Controllers/PersonController.cs
@@ -847,7 +847,8 @@ namespace WebAPI.Controllers
                                         x.ExchangeTime,
                                         x.ExchangeTime2,
                                         x.PhotoUrl,
-                                        x.IsUsed
+                                        x.IsUsed,
+                                        Blacklist=x.IsBlacklist
                                     }).Take(400).ToList();
             }
             catch (Exception ex)
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 1a1a9a6c..cbae34bb 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

From 5c6ba467f25b0363c9d29cd3a720e8e7cba87852 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Sun, 7 Dec 2025 15:28:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs | 2 ++
 SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs
index 2414ff93..71f6e13d 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs
@@ -174,6 +174,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
             var result = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == PersonId);
             if (result != null)
             {
+                result.ExchangeTime = null;
+                result.ExchangeTime2 = null;
                 result.IsBlacklist = false;
                 Funs.DB.SubmitChanges();
                 BindGrid();
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
index f44f4874..6b59cb57 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
@@ -723,6 +723,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
             var result = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == PersonId);
             if (result != null)
             {
+                result.ExchangeTime = null;
+                result.ExchangeTime2 = null;
                 result.IsBlacklist = true;
                 Funs.DB.SubmitChanges();
                 BindGrid();