|
|
@@ -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( "☆");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|