Selaa lähdekoodia

公式说明-v1优化

lvy 4 päivää sitten
vanhempi
commit
4c78a2a375

+ 11 - 7
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1329,6 +1329,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     });
 
                 }
+            } else {
+                throw new ServiceException("暂不支持节点参数公式");
             }
         }
 
@@ -1403,13 +1405,15 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             if (data.length() == 0) {
                 Map<String, FormData> map = tec.getFormDataMap();
                 List<String> relyList = formula.getRelyList();
-                relyList.forEach(rely -> {
-                    FormData formData = map.get(rely);
-                    if (formData != null && formData.getValues() != null) {
-                        String value = formData.getValues().stream().map(ElementData::getValue).filter(Objects::nonNull).map(Objects::toString).collect(Collectors.joining(","));
-                        data.append(value).append( "☆");
-                    }
-                });
+                if (relyList != null) {
+                    relyList.forEach(rely -> {
+                        FormData formData = map.get(rely);
+                        if (formData != null && formData.getValues() != null) {
+                            String value = formData.getValues().stream().map(ElementData::getValue).filter(Objects::nonNull).map(Objects::toString).collect(Collectors.joining(","));
+                            data.append(value).append( "☆");
+                        }
+                    });
+                }
             }
         }