From 53e82c04c557f2a66a76298940081ebd55cdadc2 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Fri, 7 Apr 2023 18:14:09 +0800
Subject: [PATCH] 2023-04-07

---
 .vs/SGGL_SeDin/v17/.wsuo                     | Bin 29184 -> 28672 bytes
 SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index ab63736c7d49bb5ccf8f6c6c2870c405977981cb..b40d34310565affa495750980a8e1c33667ce67f 100644
GIT binary patch
delta 808
zcmZp8!r1VDaYGIh>jmN8dZwETnHDqFb1^V5{6_;kKrule<^^IIAXWzAe^50dKsGlJ
z%R|K^fi$vqAtb&i5?cYt=0oDE0NJVx47v;&NP?O`whj_s7s%EFVtpVs1>%W;A{=Hw
znjeTa2C6VlV#;BiQ2q<#7q-=mA|StT0x`(V96${615isnHaElk19Ce)H!A_n0I30m
z0o2VTIT@&RVu&Ev)nY&+K(5}z6~QPF4&;E`0K!o~_T&t1naLqs5}W66FK6UsR0j&F
z0Wnba|Kvb9mCYr*Pe|4@xrDc8kr>M)A!l9&HlSgkuz?vkxkSi+va^KY<}X44Ogtb_
zb|hKG<jJL?!5koA5CFMg@)yyN%^p%a**7zaI5QHXgG~--Vi(iqU&?H3lMD_|KFn*o
z$<T$7M;vMq+~g9Y2F9e#UyZmK7b!3;GGJL`!Lmq?X_8q9W5ncAvwFtJ&0o#988_J+
zP@EJeHu+kt)?|k`1A%{s<b0OQO<6Zx?!BcC!-ZXw8`2I;=8u=29G#%L*dd-#&>}h6
zq!yHxnSmGtCI=?yGcy9|<^)?thRp{v>=_p&ac#=F%Q*Rbf%W9Lg2K(7dF6}%q;*4*

delta 743
zcmZp8z}WDFaYGIh>w+~Yvhte?nHDqFb1*P4{D%S_AX^ZL&kJPB0<kg>|AVR#2eLVV
zSRROB`am>DUK&YE2+Ed#(uz=;4@#>+XkV}y>OhVbR01TR4P+Z2@xh9KgdtGO2#Ae=
z*aV2pffy#o4`go)RA8LMl*3wJ4)!10YDN)||G0n{<S%X@2Ki@Vph!KkKVW_X8AYr=
zlz`@d!UgINuq#OLhAd8hhyV=*`C}7T1fxI%kOOiN3{TGBmSIeq?8_y-c@Fn-#>t17
z3^$kXJ|Rls<PzSVNn*~tj36h2q7dZf$%5=ElS{<>!6tnX3t-{_d4e5DmN9&Csbnw*
z8<NoEFOngfJ%n~JZ<1o<*vzQ#pK*~2+ad*~$@^niH?wN|W?W>#w8(&EkqXl!tCGnj
zHbB#@3@3lFxiI;Nwap?EmQ6MX6ek}@J*i@3l44<;l$NGzVVY{8YhsaRtecdQmZWQx
zW|?MbkZ5j}Y>>ElZQ5m~$p<nU7A0|QcE~xvJUKyuV={+=#pIxT<;iz**8s8gWafOG
M$(?!jlS}iv0jTOlvH$=8

diff --git a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
index f6b55561..b1b34718 100644
--- a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
@@ -193,9 +193,9 @@ namespace FineUIPro.Web.HJGL.NDT
         /// </summary>
         /// <param name="node"></param>
         private void BindNodes(TreeNode node)
-        {
+        {     ///&& x.TrustType == (this.Type == "R" ? "R" : null)
             var p = from x in Funs.DB.HJGL_Batch_BatchTrust
-                    where x.UnitWorkId == node.NodeID && x.TrustType == (this.Type == "R" ? "R" : null)
+                    where x.UnitWorkId == node.NodeID && Equals(x.TrustType, (this.Type == "R" ? "R" : null)) 
                     && x.TrustDate < Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01").AddMonths(1)
                     && x.TrustDate >= Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01")
                     select x;