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

2.附件必填校验

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PrepaybillContractPlugin.java

@@ -55,6 +55,7 @@ public class PrepaybillContractPlugin extends AbstractBillPlugIn implements Plug
                 for (DynamicObject entryObj : goodsEntities) {
                     //获取合同签订日期
                     Date signdate = entryObj.getDate("signdate");
+                    if(signdate != null){
                         LocalDate localDate = dateToLocalDate(signdate);
                         int signdateYear = localDate.getYear();
                         int currentYear = LocalDate.now().getYear();
@@ -62,6 +63,7 @@ public class PrepaybillContractPlugin extends AbstractBillPlugIn implements Plug
                             isMsg = true;
                         }
                     }
+                }
                 if(isMsg){
                     this.getView().showTipNotification("去年合同不占用本年预算");
                 }