Merge pull request #130 from POFerro/develop

returns null instead of empty string for blank cells
donnytian · Nov 3, 2023 · 0934a9b · 0934a9b
2 parents 7ee9651 + 36e09f2
commit 0934a9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Npoi.Mapper/src/Npoi.Mapper/MapHelper.cs b/Npoi.Mapper/src/Npoi.Mapper/MapHelper.cs
@@ -336,9 +336,13 @@ public static bool TryGetCellValue(ICell cell, Type targetType, TrimSpacesType t
         value = null;
         if (cell == null) return true;
 
-        if (targetType == StringType)
+        var cellType = GetCellType(cell);
+
+        if (targetType == StringType && cellType != CellType.Blank)
         {
-            value = TrimString(CellDataFormatter.FormatCellValue(cell, evaluator));
+            string trimmedValue = TrimString(CellDataFormatter.FormatCellValue(cell, evaluator));
+            value = trimmedValue?.Length == 0 ? null : trimmedValue;
+
             return true;
         }
 
@@ -361,7 +365,7 @@ string TrimString(string raw)
             }
         }
 
-        switch (GetCellType(cell))
+        switch (cellType)
         {
             case CellType.String:
 

diff --git a/Npoi.Mapper/test/NestedPropertyTests.cs b/Npoi.Mapper/test/NestedPropertyTests.cs
@@ -89,9 +89,9 @@ public void ImportWithNestedPropertiesTest()
         Assert.AreEqual(addressId, objs[0].Value.Billing.Address.AddressId);
         Assert.AreEqual(date.Date, objs[0].Value.Billing.Dates.Dto.Date);
 
-        Assert.AreEqual("", objs[1].Value.Name);
+        Assert.AreEqual(null, objs[1].Value.Name);
         Assert.AreEqual(customerAge, objs[1].Value.Age);
-        Assert.AreEqual("", objs[1].Value.Billing.Contact.Name);
+        Assert.AreEqual(null, objs[1].Value.Billing.Contact.Name);
         Assert.AreEqual(null, objs[1].Value.Billing.Address);
         Assert.AreEqual(DateTime.MinValue, objs[1].Value.Billing.Dates.Dto.Date);
     }