diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
index 67d3094..d347fbe 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@@ -7010,7 +7010,7 @@
Cover.aspx
- ASPXCodeBehind
+ Component
Cover.aspx
@@ -7080,7 +7080,7 @@
PressureTestOfPipelineSystemRecord.aspx
- ASPXCodeBehind
+ Component
PressureTestOfPipelineSystemRecord.aspx
@@ -7149,14 +7149,14 @@
CommencementReportEdit.aspx
- ASPXCodeBehind
+ Component
ConcealedWorksInspectionRecord.aspx
ConcealedWorksInspectionRecord.aspx
- ASPXCodeBehind
+ Component
ConcealedWorksInspectionRecordEdit.aspx
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
index 3ae6571..a72c770 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
@@ -346,7 +346,11 @@ namespace FineUIPro.Web.HJGL.DataIn
isoInfo.MaterialStandardId = materialStandards.Where(x => x.MaterialStandardName == row[dataColumn.ColumnName].ToString()||x.MaterialStandardCode == row[dataColumn.ColumnName].ToString()).Select(x => x.MaterialStandardId).FirstOrDefault();
break;
case "介质":
- isoInfo.SER_ID = services.Where(x => x.SER_Name == row[dataColumn.ColumnName].ToString() || x.SER_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.SER_ID).FirstOrDefault();
+ var SER_ID = services.Where(x => x.SER_Name == row[dataColumn.ColumnName].ToString() || x.SER_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.SER_ID).FirstOrDefault();
+ if (!string.IsNullOrEmpty(SER_ID))
+ {
+ isoInfo.SER_ID = SER_ID;
+ }
break;
case "管道类别":
isoInfo.PipeLineClass = row[dataColumn.ColumnName].ToString();