diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs
index 8794091f..f912140b 100644
--- a/SGGL/BLL/Common/Funs.cs
+++ b/SGGL/BLL/Common/Funs.cs
@@ -184,6 +184,16 @@ namespace BLL
             return;
         }
 
+        /// <summary>
+        /// 为目标下拉框加上选择内容
+        /// </summary>
+        /// <param name="DLL">目标下拉框</param>
+        public static void FineUIPleaseSelectNull(FineUIPro.DropDownList DDL, string text)
+        {
+            DDL.Items.Insert(0, new FineUIPro.ListItem(text, null));
+            return;
+        }
+
         /// <summary>
         /// 为目标下拉框加上 "重新编制" 项
         /// </summary>
diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
index e0f7bc2e..87597ebb 100644
--- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
@@ -128,7 +128,7 @@ namespace BLL
                     db.SubmitChanges();
 
                     ////鍦ㄥ矖
-                    if (sitePerson.States == Const.ProjectPersonStates_1)
+                    if (sitePerson.States == Const.ProjectPersonStates_1 )
                     {
                         Model.SitePerson_PersonItem newPersonItem = new Model.SitePerson_PersonItem
                         {
@@ -157,6 +157,7 @@ namespace BLL
                                 db.SubmitChanges();
                             }
                         }
+
                         getPersons.CurrentProjectId = sitePerson.ProjectId;
                         getPersons.CurrentProjectRoleId = sitePerson.RoleIds;
                         getPersons.CurrentProjectWorkPostId = sitePerson.WorkPostId;
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 530ae0d8..e69de29b 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -1,426 +0,0 @@
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:HttpCompileException
-閿欒淇℃伅:e:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\Person\CompanyPerson.aspx(41): error CS1061: 鈥淎SP.person_companyperson_aspx鈥濅笉鍖呭惈鈥渃kIsTemp_CheckedChanged鈥濈殑瀹氫箟锛屽苟涓旀壘涓嶅埌鍙帴鍙楃被鍨嬩负鈥淎SP.person_companyperson_aspx鈥濈殑绗竴涓弬鏁扮殑鎵╁睍鏂规硶鈥渃kIsTemp_CheckedChanged鈥�(鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?)
-閿欒鍫嗘爤:
-   鍦� System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
-   鍦� System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   鍦� System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   鍦� System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   鍦� System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   鍦� System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   鍦� System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   鍦� System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   鍦� System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   鍦� System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-鍑洪敊鏃堕棿:10/18/2022 11:00:45
-鍑洪敊鏂囦欢:http://localhost:8008/Person/CompanyPerson.aspx
-IP鍦板潃:::1
-
-鍑洪敊鏃堕棿:10/18/2022 11:00:45
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:NullReferenceException
-閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
-閿欒鍫嗘爤:
-   鍦� FineUIPro.Web.Person.PersonLib.GetButtonPower() 浣嶇疆 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\Person\PersonLib.aspx.cs:琛屽彿 78
-   鍦� FineUIPro.Web.Person.PersonLib.Page_Load(Object sender, EventArgs e) 浣嶇疆 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\Person\PersonLib.aspx.cs:琛屽彿 21
-   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
-   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
-   鍦� System.Web.UI.Control.LoadRecursive()
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/18/2022 14:37:17
-鍑洪敊鏂囦欢:http://localhost:8008/Person/PersonLib.aspx?vsedit=true
-IP鍦板潃:::1
-
-鍑洪敊鏃堕棿:10/18/2022 14:37:17
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:HttpException
-閿欒淇℃伅:鏂囦欢鈥�/Person/ShuntList.aspx鈥濅笉瀛樺湪銆�
-閿欒鍫嗘爤:
-   鍦� System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath)
-   鍦� System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   鍦� System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   鍦� System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   鍦� System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   鍦� System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   鍦� System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   鍦� System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   鍦� System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   鍦� System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-鍑洪敊鏃堕棿:10/18/2022 15:41:53
-鍑洪敊鏂囦欢:http://localhost:8008/Person/ShuntList.aspx
-IP鍦板潃:::1
-
-鍑洪敊鏃堕棿:10/18/2022 15:41:53
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:EvaluateException
-閿欒淇℃伅:鏈壘鍒板垪 [鏉愭枡缂栫爜]銆�
-閿欒鍫嗘爤:
-   鍦� System.Data.NameNode.Bind(DataTable table, List`1 list)
-   鍦� System.Data.BinaryNode.Bind(DataTable table, List`1 list)
-   鍦� System.Data.BinaryNode.Bind(DataTable table, List`1 list)
-   鍦� System.Data.BinaryNode.Bind(DataTable table, List`1 list)
-   鍦� System.Data.DataExpression.Bind(DataTable table)
-   鍦� System.Data.DataExpression..ctor(DataTable table, String expression, Type type)
-   鍦� System.Data.DataTable.Select(String filterExpression)
-   鍦� FineUIPro.Web.HJGL.WeldingManage.PipelineMatIn.AddDatasetToSQL(DataTable pds, Int32 Cols) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingManage\PipelineMatIn.aspx.cs:琛屽彿 155
-   鍦� FineUIPro.Web.HJGL.WeldingManage.PipelineMatIn.btnAudit_Click(Object sender, EventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingManage\PipelineMatIn.aspx.cs:琛屽彿 377
-   鍦� FineUIPro.Button.OnClick(EventArgs e)
-   鍦� (Button , EventArgs )
-   鍦� FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/24/2022 01:24:42
-鍑洪敊鏂囦欢:http://localhost:8008/HJGL/WeldingManage/PipelineMatIn.aspx?UnitWorkId=5c955308-1645-4575-acbf-68dd66c4179a
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/24/2022 01:24:42
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:InvalidOperationException
-閿欒淇℃伅:搴忓垪涓嶅寘鍚换浣曞厓绱�
-閿欒鍫嗘爤:
-   鍦� System.Linq.Enumerable.First[TSource](IEnumerable`1 source)
-   鍦� FineUIPro.Web.HJGL.PreDesign.PipelingDivide.ConvertPipeArea(Object PipeArea) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\PreDesign\PipelingDivide.aspx.cs:琛屽彿 375
-   鍦� ASP.hjgl_predesign_pipelingdivide_aspx.__DataBindingtxt(Object sender, EventArgs e) 浣嶇疆 d:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\PreDesign\PipelingDivide.aspx:琛屽彿 119
-   鍦� System.Web.UI.Control.OnDataBinding(EventArgs e)
-   鍦� System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
-   鍦� System.Web.UI.Control.DataBind()
-   鍦� System.Web.UI.Control.DataBindChildren()
-   鍦� System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
-   鍦� System.Web.UI.Control.DataBind()
-   鍦� (Control )
-   鍦� FineUIPro.GridRow.BkpgFeAELTFlAvoTrOBrConfcLJbA()
-   鍦� (GridRow )
-   鍦� FineUIPro.Grid.BkpgFeAELTFlAvoTrOBrConfcLJbA(Int32 , Object )
-   鍦� (Grid , Int32 , Object )
-   鍦� FineUIPro.Grid.LDChsdiaqdhUTcxBcQPMKyQFfjEDB(DataTable , Boolean )
-   鍦� (Grid , DataTable , Boolean )
-   鍦� FineUIPro.Grid.DataBind(Boolean keepCurrentData)
-   鍦� (Grid , Boolean )
-   鍦� FineUIPro.Grid.DataBind()
-   鍦� FineUIPro.Web.HJGL.PreDesign.PipelingDivide.BindGrid() 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\PreDesign\PipelingDivide.aspx.cs:琛屽彿 207
-   鍦� FineUIPro.Web.HJGL.PreDesign.PipelingDivide.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\PreDesign\PipelingDivide.aspx.cs:琛屽彿 143
-   鍦� FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e)
-   鍦� (Tree , TreeCommandEventArgs )
-   鍦� FineUIPro.Tree.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/24/2022 22:26:31
-鍑洪敊鏂囦欢:http://localhost:8008/HJGL/PreDesign/PipelingDivide.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/24/2022 22:26:31
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:IndexOutOfRangeException
-閿欒淇℃伅:鏃犳硶鎵惧埌鍒� UnitWorkCode銆�
-閿欒鍫嗘爤:
-   鍦� System.Data.DataTable.ParseSortString(String sortString)
-   鍦� System.Data.DataView.CheckSort(String sort)
-   鍦� System.Data.DataView.set_Sort(String value)
-   鍦� FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:琛屽彿 458
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 355
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 238
-   鍦� FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e)
-   鍦� (Tree , TreeCommandEventArgs )
-   鍦� FineUIPro.Tree.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/25/2022 18:40:26
-鍑洪敊鏂囦欢:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/25/2022 18:40:26
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:IndexOutOfRangeException
-閿欒淇℃伅:鏃犳硶鎵惧埌鍒� UnitWorkCode銆�
-閿欒鍫嗘爤:
-   鍦� System.Data.DataTable.ParseSortString(String sortString)
-   鍦� System.Data.DataView.CheckSort(String sort)
-   鍦� System.Data.DataView.set_Sort(String value)
-   鍦� FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:琛屽彿 458
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 355
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 238
-   鍦� FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e)
-   鍦� (Tree , TreeCommandEventArgs )
-   鍦� FineUIPro.Tree.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/25/2022 18:40:28
-鍑洪敊鏂囦欢:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/25/2022 18:40:28
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:IndexOutOfRangeException
-閿欒淇℃伅:鏃犳硶鎵惧埌鍒� UnitWorkCode銆�
-閿欒鍫嗘爤:
-   鍦� System.Data.DataTable.ParseSortString(String sortString)
-   鍦� System.Data.DataView.CheckSort(String sort)
-   鍦� System.Data.DataView.set_Sort(String value)
-   鍦� FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:琛屽彿 458
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 355
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 238
-   鍦� FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e)
-   鍦� (Tree , TreeCommandEventArgs )
-   鍦� FineUIPro.Tree.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/25/2022 18:40:29
-鍑洪敊鏂囦欢:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/25/2022 18:40:29
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:IndexOutOfRangeException
-閿欒淇℃伅:鏃犳硶鎵惧埌鍒� UnitWorkCode銆�
-閿欒鍫嗘爤:
-   鍦� System.Data.DataTable.ParseSortString(String sortString)
-   鍦� System.Data.DataView.CheckSort(String sort)
-   鍦� System.Data.DataView.set_Sort(String value)
-   鍦� FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:琛屽彿 458
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 355
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 238
-   鍦� FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e)
-   鍦� (Tree , TreeCommandEventArgs )
-   鍦� FineUIPro.Tree.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/25/2022 18:40:30
-鍑洪敊鏂囦欢:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/25/2022 18:40:30
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:IndexOutOfRangeException
-閿欒淇℃伅:鏃犳硶鎵惧埌鍒� UnitWorkCode銆�
-閿欒鍫嗘爤:
-   鍦� System.Data.DataTable.ParseSortString(String sortString)
-   鍦� System.Data.DataView.CheckSort(String sort)
-   鍦� System.Data.DataView.set_Sort(String value)
-   鍦� FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:琛屽彿 458
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 355
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 238
-   鍦� FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e)
-   鍦� (Tree , TreeCommandEventArgs )
-   鍦� FineUIPro.Tree.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/25/2022 18:40:32
-鍑洪敊鏂囦欢:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/25/2022 18:40:32
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:IndexOutOfRangeException
-閿欒淇℃伅:鏃犳硶鎵惧埌鍒� UnitWorkCode銆�
-閿欒鍫嗘爤:
-   鍦� System.Data.DataTable.ParseSortString(String sortString)
-   鍦� System.Data.DataView.CheckSort(String sort)
-   鍦� System.Data.DataView.set_Sort(String value)
-   鍦� FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:琛屽彿 458
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 355
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 238
-   鍦� FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e)
-   鍦� (Tree , TreeCommandEventArgs )
-   鍦� FineUIPro.Tree.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/25/2022 18:41:58
-鍑洪敊鏂囦欢:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/25/2022 18:41:58
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:KeyNotFoundException
-閿欒淇℃伅:缁欏畾鍏抽敭瀛椾笉鍦ㄥ瓧鍏镐腑銆�
-閿欒鍫嗘爤:
-   鍦� System.Collections.Generic.Dictionary`2.get_Item(TKey key)
-   鍦� BLL.Funs.get_DB() 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\BLL\Common\Funs.cs:琛屽彿 140
-   鍦� FineUIPro.Web.PageBase.get_CurrUser() 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:琛屽彿 39
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 83
-   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
-   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
-   鍦� System.Web.UI.Control.LoadRecursive()
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/25/2022 18:42:00
-鍑洪敊鏂囦欢:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx
-IP鍦板潃:::1
-
-鍑洪敊鏃堕棿:10/25/2022 18:42:01
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:IndexOutOfRangeException
-閿欒淇℃伅:鏃犳硶鎵惧埌鍒� UnitWorkCode銆�
-閿欒鍫嗘爤:
-   鍦� System.Data.DataTable.ParseSortString(String sortString)
-   鍦� System.Data.DataView.CheckSort(String sort)
-   鍦� System.Data.DataView.set_Sort(String value)
-   鍦� FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:琛屽彿 458
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 355
-   鍦� FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:琛屽彿 238
-   鍦� FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e)
-   鍦� (Tree , TreeCommandEventArgs )
-   鍦� FineUIPro.Tree.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/25/2022 18:42:05
-鍑洪敊鏂囦欢:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx
-IP鍦板潃:127.0.0.1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/25/2022 18:42:05
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:NullReferenceException
-閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
-閿欒鍫嗘爤:
-   鍦� FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\FineUIPro.Web\indexProject.aspx.cs:琛屽彿 292
-   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
-   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
-   鍦� System.Web.UI.Control.LoadRecursive()
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/26/2022 00:40:19
-鍑洪敊鏂囦欢:http://localhost:14901/indexProject.aspx?projectId=0040f558-0a0a-4e52-a688-64a0c2e7a0d4
-IP鍦板潃:::1
-
-鍑洪敊鏃堕棿:10/26/2022 00:40:19
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:NullReferenceException
-閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
-閿欒鍫嗘爤:
-   鍦� FineUIPro.Web.common.ProjectSet.ProjectSysSet.btnSave_Click(Object sender, EventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\FineUIPro.Web\ProjectData\ProjectSysSet.aspx.cs:琛屽彿 284
-   鍦� FineUIPro.Button.OnClick(EventArgs e)
-   鍦� (Button , EventArgs )
-   鍦� FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/26/2022 00:41:20
-鍑洪敊鏂囦欢:http://localhost:14901/ProjectData/ProjectSysSet.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/26/2022 00:41:20
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:NullReferenceException
-閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
-閿欒鍫嗘爤:
-   鍦� FineUIPro.Web.common.ProjectSet.ProjectSysSet.btnSave_Click(Object sender, EventArgs e)
-   鍦� FineUIPro.Button.OnClick(EventArgs e)
-   鍦� (Button , EventArgs )
-   鍦� FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/26/2022 00:46:06
-鍑洪敊鏂囦欢:http://localhost:14901/ProjectData/ProjectSysSet.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/26/2022 00:46:06
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:NullReferenceException
-閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
-閿欒鍫嗘爤:
-   鍦� FineUIPro.Web.common.ProjectSet.ProjectSysSet.GetButtonPower() 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\FineUIPro.Web\ProjectData\ProjectSysSet.aspx.cs:琛屽彿 30
-   鍦� FineUIPro.Web.common.ProjectSet.ProjectSysSet.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\FineUIPro.Web\ProjectData\ProjectSysSet.aspx.cs:琛屽彿 18
-   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
-   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
-   鍦� System.Web.UI.Control.LoadRecursive()
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/26/2022 00:48:48
-鍑洪敊鏂囦欢:http://localhost:14901/ProjectData/ProjectSysSet.aspx
-IP鍦板潃:::1
-
-鍑洪敊鏃堕棿:10/26/2022 00:48:48
-
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:NullReferenceException
-閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
-閿欒鍫嗘爤:
-   鍦� FineUIPro.Web.common.ProjectSet.ProjectSysSet.btnSave_Click(Object sender, EventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\FineUIPro.Web\ProjectData\ProjectSysSet.aspx.cs:琛屽彿 284
-   鍦� FineUIPro.Button.OnClick(EventArgs e)
-   鍦� (Button , EventArgs )
-   鍦� FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/26/2022 00:50:19
-鍑洪敊鏂囦欢:http://localhost:14901/ProjectData/ProjectSysSet.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/26/2022 00:50:19
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:NullReferenceException
-閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
-閿欒鍫嗘爤:
-   鍦� FineUIPro.Web.common.ProjectSet.ProjectSysSet.btnSave_Click(Object sender, EventArgs e) 浣嶇疆 D:\璇哄繀杈綷璧涢紟\SGGL_SeDin\SGGL\FineUIPro.Web\ProjectData\ProjectSysSet.aspx.cs:琛屽彿 284
-   鍦� FineUIPro.Button.OnClick(EventArgs e)
-   鍦� (Button , EventArgs )
-   鍦� FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   鍦� System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:10/26/2022 00:50:37
-鍑洪敊鏂囦欢:http://localhost:14901/ProjectData/ProjectSysSet.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:10/26/2022 00:50:37
-
diff --git a/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx b/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx
index c3de4103..69d56c4e 100644
--- a/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx
+++ b/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx
@@ -37,15 +37,27 @@
                                 <f:DropDownList ID="drpCertificate" runat="server" EmptyText="鑱屼笟璧勬牸璇佷功" Width="200px"
                                     EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
                                 </f:DropDownList>
-                                <f:ToolbarFill runat="server">
-                                </f:ToolbarFill>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
                                 <f:Button ID="btnNew" Text="鏂板" Icon="Add" EnablePostBack="false" runat="server"
                                     Hidden="true">
                                 </f:Button>
+                                <f:ToolbarFill runat="server">
+                                </f:ToolbarFill>
+                                <f:DropDownList ID="drpProject" runat="server" EmptyText="娲鹃仯椤圭洰" Width="350px"
+                                    EnableEdit="true" ShowRedStar="true" Required="true" Hidden="true">
+                                </f:DropDownList>
+                                <f:Button ID="btnSure" Text="纭畾" ToolTip="纭畾娲鹃仯" Icon="Accept" Hidden="true" runat="server" OnClick="btnSure_Click">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
+                        <f:TemplateField ColumnID="Check" Width="50px" HeaderText="閫夋嫨" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:CheckBox runat="server" ID="cbSelect" />
+                            </ItemTemplate>
+                        </f:TemplateField>
                         <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="搴忓彿" HeaderTextAlign="Center"
                             TextAlign="Center">
                             <ItemTemplate>
@@ -71,7 +83,7 @@
                         <f:CheckBoxField Width="60px" SortField="IsPost" RenderAsStaticField="true" DataField="IsPost"
                             HeaderText="鍦ㄨ亴" HeaderTextAlign="Center" TextAlign="Center">
                         </f:CheckBoxField>
-                          <f:RenderField Width="100px" ColumnID="Major" DataField="Major"
+                        <f:RenderField Width="100px" ColumnID="Major" DataField="Major"
                             FieldType="String" HeaderText="涓撲笟" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="WorkPostName" DataField="WorkPostName"
@@ -89,22 +101,22 @@
                         <f:RenderField Width="90px" ColumnID="IsPostName" DataField="IsPostName"
                             FieldType="String" HeaderText="鏄惁鍦ㄨ亴" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="LastProjectName" DataField="LastProjectName" SortField="LastProjectName"
+                        <f:RenderField Width="150px" ColumnID="LastProjectName" DataField="LastProjectName" SortField="LastProjectName"
                             FieldType="String" HeaderText="鏈�杩戞墍鍦ㄩ」鐩�" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="130px" ColumnID="LastWorkPostName" DataField="LastWorkPostName"
                             FieldType="String" HeaderText="鏈�杩戦」鐩矖浣�" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                           <f:WindowField TextAlign="Left" Width="80px" WindowID="Window1" HeaderText="璇︾粏淇℃伅"
+                        <f:WindowField TextAlign="Left" Width="80px" WindowID="Window1" HeaderText="璇︾粏淇℃伅"
                             Text="鏌ョ湅" ToolTip="浜哄憳璇︾粏淇℃伅鏌ョ湅" DataIFrameUrlFields="PersonId" DataIFrameUrlFormatString="PersonView.aspx?PersonId={0}"
                             HeaderTextAlign="Center" />
-                        <%-- <f:RenderField Width="100px" ColumnID="WorkPost" DataField="WorkPost" FieldType="String"
-                            HeaderText="鎷熻仒宀椾綅" HeaderTextAlign="Center">
+                        <f:RenderField Width="100px" ColumnID="WorkPost" DataField="WorkPostName" FieldType="String"
+                            HeaderText="鎷熻仒宀椾綅" HeaderTextAlign="Center" >
                             <Editor>
-                                <f:DropDownList ID="drpWP" Required="true" runat="server">
+                                <f:DropDownList ID="drpWP" Required="true" runat="server" EnableEdit="true">
                                 </f:DropDownList>
                             </Editor>
-                        </f:RenderField>--%>
+                        </f:RenderField>
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -129,7 +141,7 @@
             <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
                 Hidden="true" runat="server" Text="缂栬緫" Icon="Pencil">
             </f:MenuButton>
-             <f:MenuButton ID="btnMenuDispatch" OnClick="btnMenuDispatch_Click" EnablePostBack="true"
+            <f:MenuButton ID="btnMenuDispatch" OnClick="btnMenuDispatch_Click" EnablePostBack="true"
                 Hidden="true" runat="server" Text="娲鹃仯" Icon="TableEdit">
             </f:MenuButton>
             <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
diff --git a/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx.cs b/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx.cs
index a8288674..80715aa1 100644
--- a/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx.cs
@@ -1,4 +1,5 @@
 锘縰sing BLL;
+using FastReport.DevComponents.Editors;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -23,20 +24,23 @@ namespace FineUIPro.Web.Person
                 Funs.DropDownPageSize(this.ddlPageSize);
 
                 this.btnNew.OnClientClick = Window1.GetShowReference("PersonEdit.aspx?Type=Shunt&UnitId=" + Const.UnitId_SEDIN + "&DepartId=" + Const.Depart_constructionId) + "return false;";
-
                 ////鏉冮檺鎸夐挳鏂规硶
                 this.GetButtonPower();
                 WorkPostService.InitWorkPostNameByTypeDropDownList2(this.drpWorkPost, "1", false);  //鍔犺浇绠＄悊宀椾綅
                 Funs.FineUIPleaseSelect(this.drpWorkPost, "璇烽�夋嫨宀椾綅");
                
-                //WorkPostService.InitWorkPostNameByTypeDropDownList(this.drpWP, "1", true);  //鍔犺浇绠＄悊宀椾綅              
-               
+                WorkPostService.InitWorkPostNameByTypeDropDownList(this.drpWP, Const.PostType_1, false);  //鍔犺浇绠＄悊宀椾綅              
+                Funs.FineUIPleaseSelectNull(this.drpWP, "璇烽�夋嫨宀椾綅");
+
                 PostTitleService.InitPostTitleDropDownList(this.drpPostTitle, false);
                 Funs.FineUIPleaseSelect(this.drpPostTitle, "璇烽�夋嫨鑱岀О");
 
                 PracticeCertificateService.InitPracticeCertificateDropDownList(this.drpCertificate, false);
                 Funs.FineUIPleaseSelect(this.drpCertificate, "璇烽�夋嫨鑱屼笟璧勬牸璇佷功");
 
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, false);
+                Funs.FineUIPleaseSelect(this.drpProject, "璇烽�夋嫨鎷熻仒椤圭洰");
+
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 缁戝畾琛ㄦ牸
                 this.BindGrid();
@@ -85,6 +89,8 @@ namespace FineUIPro.Web.Person
                 {
                     this.btnMenuEdit.Hidden = false;
                     this.btnMenuDispatch.Hidden = false;
+                    this.btnSure.Hidden = false;
+                    this.drpProject.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
@@ -254,5 +260,135 @@ namespace FineUIPro.Web.Person
                 return;
             }
         }
+
+        /// <summary>
+        /// 纭畾鎸夐挳浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSure_Click(object sender, EventArgs e)
+        {
+            if (this.drpProject.SelectedValue != BLL.Const._Null)
+            {
+                bool b = true;
+                foreach (JObject mergedRow in Grid1.GetMergedData())
+                {
+                    JObject values = mergedRow.Value<JObject>("values");
+                    int i = mergedRow.Value<int>("index");
+                    if (this.Grid1.SelectedRowIndexArray.Contains(i))
+                    {
+                        AspNet.CheckBox cb = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbSelect"));
+                        if (cb.Checked)   //閫夋嫨椤�
+                        {
+                            string workPost = values.Value<string>("WorkPost");
+                            if (string.IsNullOrEmpty(workPost))
+                            {
+                                b = false;
+                            }
+                        }
+                    }
+                }
+                if (!b)
+                {
+                    Alert.ShowInTop("鍕鹃�変汉鍛樼殑鎷熻仒宀椾綅涓嶈兘涓虹┖锛�", MessageBoxIcon.Warning);
+                    return;
+                }
+
+                int count=0;
+                int outCount = 0;
+                var workPosts = BLL.WorkPostService.GetWorkPostList();
+                foreach (JObject mergedRow in Grid1.GetMergedData())
+                {
+                    JObject values = mergedRow.Value<JObject>("values");
+                    int i = mergedRow.Value<int>("index");
+                    AspNet.CheckBox cb = (AspNet.CheckBox)(this.Grid1.Rows[i].FindControl("cbSelect"));
+                    if (cb.Checked)   //閫夋嫨椤�
+                    {
+                        string personId = this.Grid1.Rows[i].RowID;
+                        string workPostId = string.Empty;             
+                        var getWorkPost = WorkPostService.GetWorkPostByName(values.Value<string>("WorkPost"));
+                        if (getWorkPost != null)
+                        {
+                            workPostId = getWorkPost.WorkPostId;
+                        }
+                        var getPerson = Person_PersonsService.GetPerson_PersonsById(personId);
+                        if (getPerson != null)
+                        {
+                            if (getPerson.IsPost == false)
+                            {
+                                outCount++;
+                            }
+                            else
+                            {
+                                SaveSitePerson(getPerson, workPostId);
+                                Funs.DB.SubmitChanges();
+                                count++;
+                            }
+                        }
+                    }
+                }
+                string message = "鎵归噺娲鹃仯鎴愬姛锛佸叡璁℃垚鍔�" + count.ToString() + "浜恒��";
+                if (outCount > 0)
+                {
+                    message+="鏈兘娲鹃仯锛堜笉鍦ㄨ亴锛変汉鍛�" + outCount.ToString() + "浜恒��";
+                }
+                ShowNotify(message, MessageBoxIcon.Success);
+                BindGrid();
+                BLL.LogService.AddSys_Log(this.CurrUser, "浜哄憳娲鹃仯", string.Empty, BLL.Const.DepartPersonShuntMenuId, "浜哄憳鎵归噺娲鹃仯");
+            }
+            else
+            {
+                Alert.ShowInParent("璇烽�夋嫨娲鹃仯椤圭洰锛�", MessageBoxIcon.Warning);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="getPerson"></param>
+        /// <param name="workPostId"></param>
+        private void SaveSitePerson(Model.Person_Persons getPerson, string workPostId)
+        {
+            Model.SitePerson_Person newProjectPerson = new Model.SitePerson_Person
+            {
+                PersonId = getPerson.PersonId,
+                PersonName = getPerson.PersonName,
+                IdentityCard = getPerson.IdentityCard,
+                UnitId = getPerson.UnitId ?? Const.UnitId_SEDIN,
+                ProjectId = this.drpProject.SelectedValue,
+                WorkPostId = workPostId,
+                //  RoleIds = Funs.GetStringByArray(this.drpProjectRole.SelectedValueArray),
+                //TeamGroupId = this.drpTeamGroup.SelectedValue == Const._Null ? null : this.drpTeamGroup.SelectedValue,
+                InTime = DateTime.Now,
+                // AuditorId = this.drpAuditor.SelectedValue == Const._Null ? null : this.drpAuditor.SelectedValue,
+                AuditorDate = DateTime.Now,
+                OutTime = null,
+                States = Const.ProjectPersonStates_1,
+            };
+
+            var getPersonAuditor = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == newProjectPerson.ProjectId && (x.RoleIds.Contains(Const.HSSEManager) || x.RoleIds.Contains(Const.HSSEAssistantManager)));
+            if (getPersonAuditor != null)
+            {
+                newProjectPerson.AuditorId = getPersonAuditor.PersonId;
+            }
+
+            var getProjectPerson = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == newProjectPerson.ProjectId && (x.PersonId == newProjectPerson.PersonId || x.IdentityCard == newProjectPerson.IdentityCard));
+            if (getProjectPerson != null)
+            {
+                newProjectPerson.SitePersonId = getProjectPerson.SitePersonId;
+            }
+
+            if (!string.IsNullOrEmpty(newProjectPerson.SitePersonId))
+            {
+                SitePerson_PersonService.UpdateSitePerson(newProjectPerson);
+                LogService.AddSys_Log(this.CurrUser, newProjectPerson.IdentityCard, newProjectPerson.SitePersonId, BLL.Const.ProjectPersonMenuId, BLL.Const.BtnModify);
+            }
+            else
+            {
+                 newProjectPerson.SitePersonId = SQLHelper.GetNewID();
+                SitePerson_PersonService.AddSitePerson(newProjectPerson);
+                LogService.AddSys_Log(this.CurrUser, newProjectPerson.IdentityCard, newProjectPerson.SitePersonId, BLL.Const.ProjectPersonMenuId, BLL.Const.BtnAdd);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx.designer.cs b/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx.designer.cs
index 4fb105a7..e8688c19 100644
--- a/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx.designer.cs
@@ -95,6 +95,33 @@ namespace FineUIPro.Web.Person
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// drpProject 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// btnSure 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSure;
+
+        /// <summary>
+        /// cbSelect 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox cbSelect;
+
         /// <summary>
         /// lblNumber 鎺т欢銆�
         /// </summary>
@@ -131,6 +158,15 @@ namespace FineUIPro.Web.Person
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
 
+        /// <summary>
+        /// drpWP 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWP;
+
         /// <summary>
         /// ToolbarSeparator1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
index 42f0596e..aa273d0d 100644
--- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
@@ -1285,7 +1285,5 @@ namespace FineUIPro.Web.Person
         }
         #endregion
         #endregion
-
-
     }
 }
\ No newline at end of file