From 67ce2a0f9d29dc72a2a5262674c9e3144853111f Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Fri, 7 Apr 2023 18:20:30 +0800
Subject: [PATCH] =?UTF-8?q?2023-04-07-003=20=E6=97=A0=E6=8D=9F=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E5=8D=95=E5=BD=95=E5=85=A5=E6=A0=91=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
index b1b34718..df2fff4c 100644
--- a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
@@ -222,7 +222,7 @@ namespace FineUIPro.Web.HJGL.NDT
                                  join y in Funs.DB.Base_DetectionType
                                  on x.DetectionTypeId equals y.DetectionTypeId
                                  where x.ProjectId == this.CurrUser.LoginProjectId
-                                       && x.UnitWorkId == e.Node.NodeID && x.TrustType == (this.Type == "R" ? "R" : null)
+                                       && x.UnitWorkId == e.Node.NodeID && Equals(x.TrustType, (this.Type == "R" ? "R" : null))
                                        && x.DetectionTypeId == item.DetectionTypeId
                                  orderby y.DetectionTypeCode
                                  select y).Distinct();
@@ -260,7 +260,7 @@ namespace FineUIPro.Web.HJGL.NDT
                                  where x.TrustDate < Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01").AddMonths(1)
                                  && x.TrustDate >= Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01")
                                  && x.ProjectId == this.CurrUser.LoginProjectId && x.TrustBatchCode.Contains(this.txtSearchCode.Text.Trim())
-                                 && x.UnitWorkId.ToString() == e.Node.ParentNode.NodeID && x.TrustType == (this.Type == "R" ? "R" : null)
+                                 && x.UnitWorkId.ToString() == e.Node.ParentNode.NodeID && Equals(x.TrustType, (this.Type == "R" ? "R" : null))
                                  && x.DetectionTypeId == ndtTypeId && x.DetectionRateId == item.DetectionRateId
                                  orderby x.TrustBatchCode descending
                                  select x;
@@ -296,7 +296,7 @@ namespace FineUIPro.Web.HJGL.NDT
                              where x.TrustDate < Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01").AddMonths(1)
                              && x.TrustDate >= Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01")
                              && x.ProjectId == this.CurrUser.LoginProjectId && x.TrustBatchCode.Contains(this.txtSearchCode.Text.Trim())
-                             && x.UnitWorkId.ToString() == e.Node.ParentNode.ParentNode.NodeID && x.TrustType == (this.Type == "R" ? "R" : null)
+                             && x.UnitWorkId.ToString() == e.Node.ParentNode.ParentNode.NodeID && Equals(x.TrustType, (this.Type == "R" ? "R" : null))
                              && x.DetectionTypeId == ndtTypeId && x.DetectionRateId == ndtRateId
                              orderby x.TrustBatchCode descending
                              select x;