center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #11279 from dataease/pr@dev-v2@fix_export_report

Browse Source 
fix(X-Pack): 定时报告-导出excel字段类型为空导致NPE
This commit is contained in:
fit2cloud-chenyw 2024-07-31 10:06:40 +08:00 committed by GitHub
commit 6862c79626
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java
View File

@ -1,15 +1,16 @@
package io.dataease.visualization.manage; package io.dataease.visualization.manage;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import io.dataease.extensions.view.dto.ChartExtFilterDTO;
import io.dataease.extensions.view.dto.ChartViewDTO;
import io.dataease.extensions.view.dto.ChartViewFieldDTO;
import io.dataease.extensions.view.dto.ChartExtRequest;
import io.dataease.api.visualization.vo.DataVisualizationVO; import io.dataease.api.visualization.vo.DataVisualizationVO;
import io.dataease.chart.manage.ChartDataManage; import io.dataease.chart.manage.ChartDataManage;
import io.dataease.chart.manage.ChartViewManege; import io.dataease.chart.manage.ChartViewManege;
import io.dataease.constant.CommonConstants; import io.dataease.constant.CommonConstants;
import io.dataease.engine.constant.DeTypeConstants;
import io.dataease.exception.DEException; import io.dataease.exception.DEException;
import io.dataease.extensions.view.dto.ChartExtFilterDTO;
import io.dataease.extensions.view.dto.ChartExtRequest;
import io.dataease.extensions.view.dto.ChartViewDTO;
import io.dataease.extensions.view.dto.ChartViewFieldDTO;
import io.dataease.utils.AuthUtils; import io.dataease.utils.AuthUtils;
import io.dataease.utils.JsonUtil; import io.dataease.utils.JsonUtil;
import io.dataease.visualization.bo.ExcelSheetModel; import io.dataease.visualization.bo.ExcelSheetModel;
@ -97,6 +98,10 @@ public class CoreVisualizationExportManage {
if (ObjectUtils.isNotEmpty(name) && ObjectUtils.isNotEmpty(dataeaseName)) { if (ObjectUtils.isNotEmpty(name) && ObjectUtils.isNotEmpty(dataeaseName)) {
heads.add(name.toString()); heads.add(name.toString());
headKeys.add(dataeaseName.toString()); headKeys.add(dataeaseName.toString());
if (deType == null) {
field.setDeType(DeTypeConstants.DE_STRING);
deType = DeTypeConstants.DE_STRING;
}
fieldTypes.add((int) deType); fieldTypes.add((int) deType);
} }
}); });