public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-21 12:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:dataease/dataease into main

Browse Source
This commit is contained in:
taojinlong
2021-05-25 12:48:15 +08:00
parent d5c99e6ec9 c61f294e01
commit 982a7579c8
12 changed files with 122 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/dataease/service/dataset/DataSetTableUnionService.java
View File

@@ -88,6 +88,7 @@ public class DataSetTableUnionService {
criteria.andTargetTableFieldIdEqualTo(datasetTableUnion.getTargetTableFieldId());
List<DatasetTableUnion> sourceResult = datasetTableUnionMapper.selectByExample(datasetTableUnionExample);
datasetTableUnionExample.clear();
criteria = datasetTableUnionExample.createCriteria();
if (StringUtils.isNotEmpty(datasetTableUnion.getId())) {
criteria.andIdNotEqualTo(datasetTableUnion.getId());
}

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

@@ -104,7 +104,14 @@ public class PanelGroupService {
}
panelGroupMapper.updateByPrimaryKeySelective(request);
}
return panelGroupMapper.selectByPrimaryKey(panelId);
//带有权限的返回
PanelGroupRequest authRequest = new PanelGroupRequest();
authRequest.setId(panelId);
authRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
List<PanelGroupDTO> panelGroupDTOList = extPanelGroupMapper.panelGroupList(authRequest);
return panelGroupDTOList.get(0);
}