|
@@ -15,6 +15,7 @@ import com.sundata.product.rwa.util.CollectionToMapConverter;
|
|
|
import com.sundata.product.rwa.util.DataUtil;
|
|
|
import org.apache.commons.text.StringSubstitutor;
|
|
|
import org.apache.poi.ss.usermodel.*;
|
|
|
+import org.apache.poi.ss.util.CellUtil;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
import org.jxls.builder.JxlsOutputFile;
|
|
|
import org.jxls.transform.poi.JxlsPoiTemplateFillerBuilder;
|
|
@@ -153,7 +154,7 @@ public class ReportCalcService {
|
|
|
}
|
|
|
if (thisCellNumModel.size() == 1) {
|
|
|
log.debug("读取该报表配置中的手动配置公式的单元格");
|
|
|
- if (mainTmpRow.getCell(k) == null) {
|
|
|
+ if (mainTmpRow.getCell(k) != null) {
|
|
|
mainTmpCell = mainTmpRow.getCell(k);
|
|
|
} else {
|
|
|
mainTmpCell = mainTmpRow.createCell(k);
|