From f975f02b598c3911383fed07cfb83e2379975d45 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 25 Sep 2025 12:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E7=82=B9=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/CQMS/Check/EditJointCheckTwo.aspx.cs   | 2 +-
 .../CQMS/ProcessControl/InspectionManagement.aspx.cs      | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheckTwo.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheckTwo.aspx.cs
index 689407a3..4997ba94 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheckTwo.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheckTwo.aspx.cs
@@ -598,7 +598,7 @@ namespace FineUIPro.Web.CQMS.Check
         {
             string itemId = Grid1.DataKeys[e.RowIndex][0].ToString();
             var detail = jointCheckDetails.FirstOrDefault(x => x.JointCheckDetailId == itemId);
-            if (detail.HandleMan == CurrUser.UserId)
+            if (detail != null && detail.HandleMan == CurrUser.UserId)
             {
                 if (e.CommandName == "ReAttachUrl")
                 {
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
index ee2d6da4..ad8ac7c8 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
@@ -61,8 +61,12 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             }
             if (!string.IsNullOrWhiteSpace(txtEndTime.Text))
             {
-                sb.Append("AND P.InspectionDate <= @endTim ");
-                listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text)));
+                var endTime = Funs.GetNewDateTime(txtEndTime.Text);
+                if (endTime != null)
+                {
+                    sb.Append("AND P.InspectionDate <= @endTim ");
+                    listStr.Add(new SqlParameter("@endTime", endTime));
+                }
             }
             sb.Append("ORDER BY P.NoticeCode DESC ");
             SqlParameter[] parameter = listStr.ToArray();