jidj hace 5 años
padre
commit
b9e1daf0ed

+ 11 - 7
src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -58,16 +58,20 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
58 58
         Integer qualityCheckId=0;
59 59
 		if (qualitycheck.getId() == null) {
60 60
 			qualitycheckMapper.insertSelective(qualitycheck);// 新增数据
61
-            qualityCheckId = qualitycheck.getId()+1;
62
-            //新增质检
63
-            qualityInspection.setQualitycheckId(qualityCheckId);
64
-            qualityInspectionMapper.insertSelective(qualityInspection);
61
+            if(qualityInspection != null){
62
+                qualityCheckId = qualitycheck.getId()+1;
63
+                //新增质检
64
+                qualityInspection.setQualitycheckId(qualityCheckId);
65
+                qualityInspectionMapper.insertSelective(qualityInspection);
66
+            }
65 67
         } else {
66 68
             qualitycheckMapper.updateByPrimaryKeySelective(qualitycheck);// 修改数据
67
-            qualityCheckId = qualitycheck.getId();
68 69
             //修改质检
69
-            qualityInspection.setQualitycheckId(qualityCheckId);
70
-            qualityInspectionMapper.updateByPrimaryKeySelective(qualityInspection);
70
+            if(qualityInspection != null){
71
+                qualityCheckId = qualitycheck.getId();
72
+                qualityInspection.setQualitycheckId(qualityCheckId);
73
+                qualityInspectionMapper.updateByPrimaryKeySelective(qualityInspection);
74
+            }
71 75
 		}
72 76
 	}
73 77