diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 5ad24617..ccd69612 100644
Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
index bfdbc8cf..58bc7938 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
@@ -308,19 +308,18 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         //private static bool canSave;  //是否可以保存
         public string ConvertPipeArea(object PipeArea)
         {
-            string StateName = string.Empty;
-            if (!string.IsNullOrEmpty(PipeArea.ToString()))
+            string stateName = string.Empty;
+            if (PipeArea != null && !string.IsNullOrEmpty(PipeArea.ToString()))
             {
-
-                if (PipeArea != null)
-                {
-                    string txt = PipelineService.GetPipeArea().FirstOrDefault(x => x.Value == PipeArea.ToString()).Text;
+                
+                    string txt = PipelineService.GetPipeArea().FirstOrDefault(x => x.Value == PipeArea.ToString())?.Text;
 
                     return txt;
-                }
-                return "";
+                 
+                
             }
-            return StateName;
+                      
+            return stateName;
         }
         #region 焊接日报 提交事件
         // 检查用户权限
diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBook.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBook.aspx.cs
index e8511c7c..7023c3bd 100644
--- a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBook.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBook.aspx.cs
@@ -40,20 +40,26 @@ namespace FineUIPro.Web.PHTGL.Filing
             var model = new  Model.PHTGL_ContractStandingBook();
             var RoleIds = this.CurrUser.RoleIds;
 
-            if (RoleIds.Contains(Const.SedinHTGLManager))
+             
+            if (this.CurrUser.PersonId == Const.hfnbdId || this.CurrUser.PersonId == Const.sysglyId)
+            {
+
+            }
+            else if (RoleIds.Contains(Const.SedinHTGLManager) && !string.IsNullOrEmpty(RoleIds))
             {
                 //model.UnitId=this.CurrUser.UnitId;
             }
-            else if (RoleIds.Contains(Const.OtherHTGLManager))
+            else if (RoleIds.Contains(Const.OtherHTGLManager) && !string.IsNullOrEmpty(RoleIds))
             {
                 model.UnitId = this.CurrUser.UnitId;
             }
-            else if (RoleIds.Contains(Const.SedinHTGLDepartManager))
+            else if (RoleIds.Contains(Const.SedinHTGLDepartManager) && !string.IsNullOrEmpty(RoleIds))
             {
                 model.UnitId = this.CurrUser.UnitId;
                 model.DepartId= this.CurrUser.DepartId;
 
             }
+            
             else
             {
                 model.UnitId = "normal";
@@ -176,7 +182,13 @@ namespace FineUIPro.Web.PHTGL.Filing
             dropState.SelectedValue = Const._Null;
             //txtSubConstruction.Text = string.Empty;
         }
-
+ 
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        /// <param name="State"></param>
+        /// <returns></returns>
         public string ConvertState(object State)
         {
             string StateName = string.Empty;