Merge branch 'test-merge' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -3345,7 +3345,13 @@ public class CustomFunction {
      */
     public static List<Integer> strSplitDiff(Object s,Object s1){
         List<Object> datas = obj3ListNe(s);
+        if(datas.isEmpty()){
+            return null;
+        }
         List<Object> data1 = obj3ListNe(s1);
+        if(data1.isEmpty()){
+            data1.add("0");
+        }
         return NumberStringSubtraction.calculateDifference(datas.get(0).toString(), data1.get(0).toString());
     }
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -1375,7 +1375,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                     ele.add(formData);
                                 }
                             });
-                            if (ele.size() < relyList.size()) {
+                            //如果是字符串分割计算公式，不判断元素是否能获取值
+                            if (ele.size() < relyList.size() && !fd.getFormula().getFormula().contains("strSplitDiff")) {
                                 tec.getLog().put(FormulaLog.RELY, fd.getCode() + "@" + fd.getEName() + "@" + fd.getFormula().getFormula().replaceAll("'", ""));
                                 fd.getValues().forEach(e->e.setValue(null));
                                 FormData formData = tec.getFormDataMap().get(fd.getCode());