Commit 2e10d975 authored by neo's avatar neo

[bugfix] fix bb foumula set parsedFormual

parent c81e0a77
...@@ -289,9 +289,10 @@ public class ReportGeneratorImpl { ...@@ -289,9 +289,10 @@ public class ReportGeneratorImpl {
} }
//如果有正则匹配就进行更新公式解析 //如果有正则匹配就进行更新公式解析
if (isFind && !periodCellTemplateConfig.getFormula().contains("BB")) { if (isFind) {
periodCellTemplateConfig.setParsedFormula(StringUtils.isNotBlank(resultFormula) ? resultFormula : null); periodCellTemplateConfig.setParsedFormula(StringUtils.isNotBlank(resultFormula) ? resultFormula : null);
periodCellTemplateConfig.setFormula(StringUtils.isNotBlank(periodCellTemplateConfig.getFormula()) ? resultFormula : null); if (periodCellTemplateConfig.getFormula() != null && !periodCellTemplateConfig.getFormula().contains("BB("))
periodCellTemplateConfig.setFormula(StringUtils.isNotBlank(periodCellTemplateConfig.getFormula()) ? resultFormula : null);
periodCellTemplateConfigMapper.updateByPrimaryKeySelective(periodCellTemplateConfig); periodCellTemplateConfigMapper.updateByPrimaryKeySelective(periodCellTemplateConfig);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment