|
@@ -834,7 +834,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
Matcher m = RegexUtils.matcher("T\\(com.mixsmart.utils.CustomFunction\\)\\.(converge)\\(([^)]+)\\)",f);
|
|
Matcher m = RegexUtils.matcher("T\\(com.mixsmart.utils.CustomFunction\\)\\.(converge)\\(([^)]+)\\)",f);
|
|
while (m.find()){
|
|
while (m.find()){
|
|
List<FormData> target = getFormDataByCode(m.group(2));
|
|
List<FormData> target = getFormDataByCode(m.group(2));
|
|
- Object data =target.stream().flatMap(e->e.getValues().stream()).map(ElementData::getValue).collect(Collectors.toList());
|
|
|
|
|
|
+ Object data =target.stream().flatMap(e->e.getValues().stream()).map(ElementData::getValue).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
|
|
f=f.replace(m.group(),putDataWithKey(data));
|
|
f=f.replace(m.group(),putDataWithKey(data));
|
|
}
|
|
}
|
|
}
|
|
}
|