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();