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

Merge pull request #4255 from dataease/pr@dev@fix_app-datasource

Browse Source 
fix(应用): 复用历史数据源记录名称，数据源删除时在应用日志中也进行显示
This commit is contained in:
王嘉豪 2023-01-03 11:51:58 +08:00 committed by GitHub
commit 7fe50fa920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 @Resource
private PanelWatermarkMapper panelWatermarkMapper; private PanelWatermarkMapper panelWatermarkMapper;
@Resource
private DatasourceMapper datasourceMapper;
public List<PanelGroupDTO> tree(PanelGroupRequest panelGroupRequest) { public List<PanelGroupDTO> tree(PanelGroupRequest panelGroupRequest) {
String userId = String.valueOf(AuthUtils.getUser().getUserId()); String userId = String.valueOf(AuthUtils.getUser().getUserId());
panelGroupRequest.setUserId(userId); panelGroupRequest.setUserId(userId);
@ -1019,6 +1022,9 @@ public class PanelGroupService {
templateLog.setDatasourceId(newDatasourceId); templateLog.setDatasourceId(newDatasourceId);
if (PanelConstants.APP_DATASOURCE_FROM.NEW.equals(request.getDatasourceFrom())) { if (PanelConstants.APP_DATASOURCE_FROM.NEW.equals(request.getDatasourceFrom())) {
templateLog.setSourceDatasourceName(request.getDatasourceList().get(0).getName()); templateLog.setSourceDatasourceName(request.getDatasourceList().get(0).getName());
} else {
Datasource applyDatasourceInfo = datasourceMapper.selectByPrimaryKey(newDatasourceId);
templateLog.setSourceDatasourceName(applyDatasourceInfo.getName());
} }
templateLog.setDatasetGroupId(asideDatasetGroupId); templateLog.setDatasetGroupId(asideDatasetGroupId);
templateLog.setSourceDatasetGroupName(request.getDatasetGroupName()); templateLog.setSourceDatasetGroupName(request.getDatasetGroupName());