[user3] 4 tahun lalu
induk
melakukan
ee50a4c0aa

+ 5 - 2
src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DonorMaterialService.java

@@ -145,15 +145,18 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                 if (null!=cellTwo  && !"".equals(cellTwo) && !"无".equals(cellTwo)  && !"0".equals(cellTwo)) {
                     donorMaterial.setProjectName(projectName);
                     donorMaterial.setProjectId(projectId);
-                    donorMaterial.setMaterialType(cellOne);
-                    donorMaterial.setMaterialCode(cellTwo);
                     String cellThree = this.getCellValue(row.getCell(3));
+                    if ("0".equals(cellOne)) {
+                        cellOne = "";
+                    }
                     if ("0".equals(cellTwo)) {
                         cellTwo = "";
                     }
                     if ("0".equals(cellThree)) {
                         cellThree = "";
                     }
+                    donorMaterial.setMaterialType(cellOne);
+                    donorMaterial.setMaterialCode(cellTwo);
                     String cellFour = this.getCellValue(row.getCell(4));
                     String cellFive = this.getCellValue(row.getCell(5));
                     String cellSix = this.getCellValue(row.getCell(13));