提交单据管理和修改密码功能

插件库/Lskj.Control/Model/GridExtend.cs

@@ -2801,7 +2801,9 @@ namespace Lskj.Control.Model
                         GridColumnModel model = col.Tag as GridColumnModel;
                         if (cell != null)
                         {
-                            if (cell.CellType == CellType.Blank)
+                            // DevExpress导出的xlsx空值可能是内容为空的String单元格，也应按空单元格处理。
+                            if (cell.CellType == CellType.Blank ||
+                                (cell.CellType == CellType.String && string.IsNullOrEmpty(cell.StringCellValue)))
                             {
                                 //isImportRows = false;
                                 continue;
@@ -3564,7 +3566,8 @@ namespace Lskj.Control.Model
                         {
                             string field = fields[i];
                             string value = rowResult.Table.Columns.Contains(field) ? rowResult[field] + "" : null;
-                            rowItem[field] = value;
+                            
+                            if(rowItem.Table.Columns.Contains(field)) rowItem[field] = value;
                         }
                     }
                     else
@@ -3573,7 +3576,7 @@ namespace Lskj.Control.Model
                         for (int i = 0; i < fields.Length; i++)
                         {
                             string field = fields[i];
-                            rowItem[field] = DBNull.Value;
+                            if (rowItem.Table.Columns.Contains(field)) rowItem[field] = DBNull.Value;
                         }
                     }
                 }