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,11 +55,13 @@ public class PrepaybillContractPlugin extends AbstractBillPlugIn implements Plug
                 for (DynamicObject entryObj : goodsEntities) {
                     //获取合同签订日期
                     Date signdate = entryObj.getDate("signdate");
-                    LocalDate localDate = dateToLocalDate(signdate);
+                    if(signdate != null){
-                    int signdateYear = localDate.getYear();
+                        LocalDate localDate = dateToLocalDate(signdate);
-                    int currentYear = LocalDate.now().getYear();
+                        int signdateYear = localDate.getYear();
-                    if(signdateYear<currentYear) {
+                        int currentYear = LocalDate.now().getYear();
-                        isMsg = true;
+                        if(signdateYear<currentYear) {
+                            isMsg = true;
+                        }
                     }
                 }
                 if(isMsg){