1

src/main/java/com/fdkankan/sale/service/impl/DingService.java

@@ -163,7 +163,11 @@ public class DingService {
             fileContent = fileContent.replaceAll("\\{repairId}",oaData.getRepairId());
             fileContent = fileContent.replaceAll("\\{repairCreateTime}",oaData.getRepairCreateTime());
             fileContent = fileContent.replaceAll("\\{cameraTypeStr}",oaData.getCameraTypeStr());
-            fileContent = fileContent.replaceAll("\\{cameraSnCode}",oaData.getCameraSnCode());
+            if(oaData.getCameraSnCode() !=null){
+                fileContent = fileContent.replaceAll("\\{cameraSnCode}",oaData.getCameraSnCode());
+            }else {
+                fileContent = fileContent.replaceAll("\\{cameraSnCode}","");
+            }
             fileContent = fileContent.replaceAll("\\{warrantyTypeStr}",oaData.getWarrantyTypeStr());
             fileContent = fileContent.replaceAll("\\{repairStatusStr}",oaData.getRepairStatusStr());
             fileContent = fileContent.replaceAll("\\{description}",oaData.getDescription());