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(); 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 17978b44..cbae34bb 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,4 +1,4 @@ - + Debug|Any CPU