Merge remote-tracking branch 'origin/release' into release

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -169,7 +169,13 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
         recordInvoice.setGfName(gfmc);
         recordInvoice.setRzlx("5");
         recordInvoice.setYqsqStatus("1");
-        recordInvoice.setYqCurrentPeriod(current.getCurrentTaxPeriod());
+        if(current != null) {
+            recordInvoice.setYqCurrentPeriod(current.getCurrentTaxPeriod());
+        }else{
+            SimpleDateFormat format = new SimpleDateFormat("yyyyMM");
+            String month = format.format(new Date());
+            recordInvoice.setYqCurrentPeriod(month);
+        }
         recordInvoice.setCreateDate(new Date());
         recordInvoice.setYqsqDate(new Date());
         recordInvoice.setSourceSystem("2");