dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(应用): 复用历史数据源记录名称，数据源删除时在应用日志中也进行显示

Browse Source
This commit is contained in:
wangjiahao 2023-01-03 11:49:31 +08:00
parent 0cea8a41ae
commit 219af08ee3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
View File

@ -138,6 +138,9 @@ public class PanelGroupService {
@Resource
private PanelWatermarkMapper panelWatermarkMapper;
@Resource
private DatasourceMapper datasourceMapper;
public List<PanelGroupDTO> tree(PanelGroupRequest panelGroupRequest) {
String userId = String.valueOf(AuthUtils.getUser().getUserId());
panelGroupRequest.setUserId(userId);
@ -1019,6 +1022,9 @@ public class PanelGroupService {
templateLog.setDatasourceId(newDatasourceId);
if (PanelConstants.APP_DATASOURCE_FROM.NEW.equals(request.getDatasourceFrom())) {
templateLog.setSourceDatasourceName(request.getDatasourceList().get(0).getName());
} else {
Datasource applyDatasourceInfo = datasourceMapper.selectByPrimaryKey(newDatasourceId);
templateLog.setSourceDatasourceName(applyDatasourceInfo.getName());
}
templateLog.setDatasetGroupId(asideDatasetGroupId);
templateLog.setSourceDatasetGroupName(request.getDatasetGroupName());