From a9d2260381604ed5407631632d555a793122a855 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Mon, 26 Feb 2024 11:46:22 +0800
Subject: [PATCH] 2024-02-26

---
 .vs/SGGL_SeDin/v17/.wsuo                      | Bin 265216 -> 264192 bytes
 .../HJGL/WeldingManage/WeldReportEdit.aspx.cs |  17 +++++++--------
 .../PHTGL/Filing/ContractStandingBook.aspx.cs |  20 ++++++++++++++----
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 5ad24617fbf478b53338d469033cb9760e12bb4c..ccd69612a306072d8c150f2a6da1cdbebf3b4e2a 100644
GIT binary patch
delta 3550
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

delta 2534
zcmchYeN0<b6u^7#eFf|a6xuqz24%9!5N1nZlx;ya**9|^F3VyN`5Hq9v_Q+gkaiPY
zHi?5C<6ELzmTLOP%(6k<USc$oX`G2haWQI0O!S{Q73VfVH^-RgmNKEkEXL?de!2I2
z+;i_c=e+y8Jv#3ZUC##HK9x$PCk#Xq5ro|1;EQU~*1dH2_hm!y5a|YRH`@!xaFngr
zMv;6w{9tcp7P`0>T5yy<Jl{knH8Gc%MF>|5F;4CoG{zEQ<t^MO>2b59>vd{9!l(@!
z62hZ!GShti6gh|HaYQaLZ;D>{T1mErbp<pQ5(|kU!cHtAgx_KsIa8?~3CpB{+c=h(
zrdvsxRm5sy4T0Hu@75hOX(XD6X2L-@i58-jXd_&Nn`kF?61#}q#2#WV(Lp>*bP^uI
zOZZr0?6==^|D*Iquk3Y7*&>UHL^N@WPA{0uu$YS{lWe`!hEQUYX)da9uf!V3=l@IW
zlmAs>MKAA1(9Fg(O$ChiRUZJKMuG@cf1C>-JLryI4_cA1cv>aKP&bdnd4(+@1GJ(8
zMRyADc;YUDXp%{VXp)d2SKk3UXwOuwXbGVbZGeM%gA}q~(pPB3$G{0PhIU~~RM>9l
zgcoqsupY~}1)fK@(W8D&_~DI&SO4|i$ztyr`wwr;*$GYPPWPZIJq>m9?f8)~7uKRX
z<MEjEDTh>x5GuTpd=s2Fn&JTmx>G&S92`xh#ECAOmN?g(ZtSZ&gGZ~@;km35ES)!i
z873c&nHI{AsilJ8m}%8Sz9+wSk?){uZa4VN%%8)y0;p7s;Dkh|i6|nPh#~GHG(<ch
zGCB20oTAgy+!&TG(nvSjZRm3@1<Us&T_S!Uej-GKVH$rXE)%~HSBR^`O`^9t%P>yk
zot<bND(XF6R06}DB{Y%f%DJENMF+VKF+viVBWW0Xi$?y+?qZKxTr(wjBXe!2GpA>&
zq?;SW?vu~7K>cNpLM%||JBOXPoR@!w?=x%AwW1q*r5|W@<S==APV{@}W>Np3YpEA-
zq-;<t?%Awxm<f;N)FtV4f73HBqBlhs)UCJ@uA;wO>Mt)<W9d@^uMccw{;iU~k_87g
zmNGoN>D**z_!}gD1M@e=;DBc-zS}k{Sl<2?_dmmYdk$vh+pN}_`of|-YfY^^ufSSc
zm}jpptj{a9S?skn7F$t$QJvD1#u&p>UL$v?9KrKm0PHi_{rg#eqX}Y*R14^bkWZI?
zzA7KT+phO*-*UGS+qYLnXfvDL5gJ;IXPfWxb37g4m+8>s3C9+^cF-I&cMW;uW5c{v
zHoeJ`ltWR_&I1xKWY>}oBxyiN(y$+6WlI}q6s?JkaHCaK5IXYogNvBi&b#;4W58KA
z!~QufRWoQ$v^311&2OD4?&;Q<d{4JZxTLK<B8tPaGeUE!Eg8$(BjN^?_SIZYe204#
zubFv4l-Opgt=(oTuFk6|SXi7_P*Yr#S0hSXUzlH8Y_GM|RBy9Qme`UY{&w{9b>MkR
zG1VFNofowZWHToBybKkuoMdrm`9dRKF|rt?BbRkSAd76*I7^W&A9Jl@{*(_vAcq<z
z@L_{o^&S`wbSz*>#{%AURA#B%pcn@EusZNHXMs<MA+D95(6dA(@jAZ@XTRiHCRe?|
zvgOw<@B*dbB0mxz80Snrz6L6l%HOyj<eqh~1qZ)MQJjD99>5DHHwj55DgDeLX#-P+
z#<>}A*?6T~ImSEG&F;p=68xNH2Dk)~7o`NUDN4$af0d-e@`IApDPL7f570}mg>reX
kB-v$<By;qdvPBh_PQ5Kdl%x+E6f(>PWxrbLWIj{IpS)00cmMzZ

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;