diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index ab63736c..b40d3431 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ 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 /// /// 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;