gitignore

src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DonorMaterialService.java

@@ -142,13 +142,7 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
             if (null != row) {
                 String cellOne = this.getCellValue(row.getCell(1));
                 String cellTwo = this.getCellValue(row.getCell(2));
-                if (!"".equals(cellOne) && !"".equals(cellTwo) && !"无".equals(cellTwo)) {
-                    if ("0".equals(cellOne)) {
-                        cellOne = "";
-                    }
-                    if ("0".equals(cellTwo)) {
-                        cellTwo = "";
-                    }
+                if (null!=cellOne && null!=cellTwo && !"".equals(cellOne) && !"".equals(cellTwo) && !"无".equals(cellTwo) && !"0".equals(cellOne) && !"0".equals(cellTwo)) {
                     donorMaterial.setProjectName(projectName);
                     donorMaterial.setProjectId(projectId);
                     donorMaterial.setMaterialType(cellOne);