diff --git a/SGGL/BLL/CQMS/Check/CheckControlService.cs b/SGGL/BLL/CQMS/Check/CheckControlService.cs
index fd2cbdbd..371282a8 100644
--- a/SGGL/BLL/CQMS/Check/CheckControlService.cs
+++ b/SGGL/BLL/CQMS/Check/CheckControlService.cs
@@ -142,9 +142,9 @@ namespace BLL
         {
             if (state == Const.CheckControl_Compile || state == Const.CheckControl_ReCompile)  //无是否同意
             {
-                ListItem[] lis = new ListItem[2];
-                lis[0] = new ListItem("总包负责人审核", Const.CheckControl_Audit1);
-                lis[1] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2);
+                ListItem[] lis = new ListItem[1];
+                //lis[0] = new ListItem("总包负责人审核", Const.CheckControl_Audit1);
+                lis[0] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2);
                 return lis;
             }
             else if (state == Const.CheckControl_Audit1)//有是否同意
@@ -156,9 +156,9 @@ namespace BLL
             }
             else if (state == Const.CheckControl_Audit2 || state == Const.CheckControl_ReCompile2)//无是否同意
             {
-                ListItem[] lis = new ListItem[2];
-                lis[0] = new ListItem("分包负责人审批", Const.CheckControl_Audit3);
-                lis[1] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4);
+                ListItem[] lis = new ListItem[1];
+                //lis[0] = new ListItem("分包负责人审批", Const.CheckControl_Audit3);
+                lis[0] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4);
                 return lis;
             }
             else if (state == Const.CheckControl_Audit3)//有是否同意
@@ -170,10 +170,10 @@ namespace BLL
             }
             else if (state == Const.CheckControl_Audit4)//有是否同意
             {
-                ListItem[] lis = new ListItem[3];
-                lis[0] = new ListItem("总包负责人确认", Const.CheckControl_Audit5);//是 加载
-                lis[1] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载
-                lis[2] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
+                ListItem[] lis = new ListItem[2];
+                //lis[0] = new ListItem("总包负责人确认", Const.CheckControl_Audit5);//是 加载
+                lis[0] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载
+                lis[1] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
                 return lis;
             }
             else if (state == Const.CheckControl_Audit5)//有是否同意
diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
index 69faccb3..fd9af7d8 100644
--- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
@@ -194,11 +194,12 @@ namespace BLL
                     newitem.IdentityCard = getPerson.IdentityCard;
                     if (!getPerson.MultiProject.HasValue || getPerson.MultiProject == false)
                     {
+                        var getdate = newitem.InTime.HasValue ? newitem.InTime.Value.AddDays(-1) : DateTime.Now;
                         ///未离场项目 先离场
-                        OutPersonItem(newitem.PersonId, null, DateTime.Now);
+                        OutPersonItem(newitem.PersonId, null, getdate);
                     }
 
-                    var getPersonItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.PersonId == getPerson.PersonId
+                    var getPersonItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.PersonId == getPerson.PersonId && x.ProjectId == newitem.ProjectId
                         && x.InTime <= newitem.InTime && (x.OutTime > newitem.InTime || !x.OutTime.HasValue));
                     if (getPersonItem != null)
                     {
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx
index d5a88afc..4a09ea70 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx
@@ -45,7 +45,7 @@
                                     <f:FormRow>
                                         <Items>
                                             <f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right"
-                                                MaxLength="50">
+                                                >
                                             </f:TextBox>
                                             <f:TextBox ID="txtDocCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right"
                                                 MaxLength="50">
diff --git a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
index 08543df8..59e51c48 100644
--- a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
@@ -192,6 +192,10 @@ namespace FineUIPro.Web.CQMS.PersonManage
                 rootNode.EnableClickEvent = true;
                 this.tvControlItem.Nodes.Add(rootNode);
                 var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.States == Const.ProjectPersonStates_1 && x.UnitId == item.UnitId && x.WelderCode.Contains(txtQueryWelderCode.Text.Trim()) select x).ToList();
+                if (!string.IsNullOrEmpty(txtQueryWelderCode.Text.Trim()))
+                {
+                    getWelders = getWelders.Where(x => x.WelderCode.Contains(txtQueryWelderCode.Text.Trim())).ToList();
+                }
                 foreach (var sitem in getWelders)
                 {
                     TreeNode tn = new TreeNode();
@@ -202,7 +206,7 @@ namespace FineUIPro.Web.CQMS.PersonManage
                     }
                     else
                     {
-                        tn.Text = sitem.PersonName+"【" + sitem.WelderCode + "】";
+                        tn.Text = sitem.PersonName + "【" + sitem.WelderCode + "】";
                     }
                     tn.EnableClickEvent = true;
                     rootNode.Nodes.Add(tn);
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 3938097a..a123cd46 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -12889,7 +12889,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:2087/</IISUrl>
+          <IISUrl>http://localhost:7022/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
diff --git a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs
index da3926d4..0d0f4552 100644
--- a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs
@@ -324,17 +324,12 @@ namespace FineUIPro.Web.Person
             if (getPerson != null && getPerson.IsPost == true)
             {
                 var getcuuProject = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == getPerson.IdentityCard && x.States == Const.ProjectPersonStates_1);
-                if (getcuuProject == null || getPerson.MultiProject == true)
+                if (getcuuProject != null && (getPerson.MultiProject == false|| !getPerson.MultiProject.HasValue))
                 {
-                    ////人员直接派遣时候
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectPersonEdit.aspx?PersonId={0}&Type=P", Grid1.SelectedRowID, "查看 - ")));
-                }
-                else
-                {
-                    var getProjectName = ProjectService.GetProjectNameByProjectId(getcuuProject.ProjectId) ?? "";
-                    Alert.ShowInParent("当前人员已在项目："+getProjectName+"任职，请选择不在项目的人员派遣！", MessageBoxIcon.Warning);
-                    return;
+                    SitePerson_PersonService.SetSitePerson_PersonStates(getcuuProject.SitePersonId, Const.ProjectPersonStates_2, DateTime.Now);
                 }
+                ////人员直接派遣时候
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectPersonEdit.aspx?PersonId={0}&Type=P", Grid1.SelectedRowID, "查看 - ")));
             }
             else
             {
diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
index 6b877755..65eed927 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
@@ -60,5 +60,6 @@
 <TreeNode id="5F0969E3-2A0A-473E-92BE-4DD390602556" Text="焊接缺陷分析" NavigateUrl="HJGL/WeldingReport/DefectStatistics.aspx"></TreeNode>
 <TreeNode id="EAD61207-E396-45B0-A1D2-7A5F0498AACC" Text="管道预制率分析" NavigateUrl="HJGL/WeldingReport/PipePrefabricationRateStatistics.aspx"></TreeNode>
 <TreeNode id="854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B" Text="焊工功效分析" NavigateUrl="HJGL/WeldingReport/WelderEfficacy.aspx"></TreeNode>
+<TreeNode id="6035E549-66FF-4B6D-989B-BE99C9EF5EB7" Text="焊接数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx"></TreeNode>
 </TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index 1946c763..a3c02166 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -26,6 +26,5 @@
 <TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
 <TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
 <TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
-<TreeNode id="S89E5EC2-F725-4656-9110-5AF83C18FB6C" Text="实业数据" NavigateUrl="ZHGL/DataSync/SYHSEData_Data.aspx"></TreeNode>
 </TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs
index 6d42a7b9..71d4b2d7 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs
@@ -596,7 +596,7 @@ namespace FineUIPro.Web
         protected void btnHome_Click(object sender, EventArgs e)
         {
             if (string.IsNullOrEmpty(this.CurrUser.LastProjectId)
-                && ((this.CurrUser.UnitId == Const.UnitId_SEDIN && this.CurrUser.IsOffice == true) || this.CurrUser.PersonId == Const.sysglyId || this.CurrUser.PersonId == Const.hfnbdId))
+                && ((this.CurrUser.UnitId == Const.UnitId_SEDIN && (this.CurrUser.IsOffice == true || this.CurrUser.RoleIds != null)) || this.CurrUser.PersonId == Const.sysglyId || this.CurrUser.PersonId == Const.hfnbdId))
             {
                 Person_PersonsService.UpdateLastUserInfo(this.CurrUser.PersonId, null, true, this.CurrUser.LoginProjectId);
                 this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;