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

Merge pull request #408 from dataease/pr@v1.1@refactor_flyway_remove-limit

Browse Source 
fix:修复普通用户创建视图权限查不到的问题
This commit is contained in:
王嘉豪 2021-07-29 15:00:50 +08:00 committed by GitHub
commit 73b7f13b20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/dataease/controller/chart/ChartViewController.java
View File

@ -1,6 +1,7 @@
package io.dataease.controller.chart; package io.dataease.controller.chart;
import io.dataease.base.domain.ChartViewWithBLOBs; import io.dataease.base.domain.ChartViewWithBLOBs;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.controller.request.chart.ChartExtRequest; import io.dataease.controller.request.chart.ChartExtRequest;
import io.dataease.controller.request.chart.ChartViewRequest; import io.dataease.controller.request.chart.ChartViewRequest;
import io.dataease.dto.chart.ChartViewDTO; import io.dataease.dto.chart.ChartViewDTO;
@ -68,6 +69,12 @@ public class ChartViewController {
@PostMapping("/getOneWithPermission/{id}") @PostMapping("/getOneWithPermission/{id}")
public ChartViewDTO getOneWithPermission(@PathVariable String id, @RequestBody ChartExtRequest requestList) throws Exception { public ChartViewDTO getOneWithPermission(@PathVariable String id, @RequestBody ChartExtRequest requestList) throws Exception {
return chartViewService.getData(id, requestList); //如果能获取用户 则添加对应的权限
ChartViewDTO dto = chartViewService.getData(id, requestList);
if(dto!=null && AuthUtils.getUser()!=null){
ChartViewDTO permissionDto = chartViewService.getOneWithPermission(dto.getId());
dto.setPrivileges(permissionDto.getPrivileges());
}
return dto;
} }
} }

5
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -347,11 +347,6 @@ public class ChartViewService {
BeanUtils.copyBean(dto, view); BeanUtils.copyBean(dto, view);
dto.setData(map); dto.setData(map);
dto.setSql(datasourceRequest.getQuery()); dto.setSql(datasourceRequest.getQuery());
//如果能获取用户 则添加对应的权限
if(AuthUtils.getUser()!=null){
ChartViewDTO permissionDto = getOneWithPermission(dto.getId());
dto.setPrivileges(permissionDto.getPrivileges());
}
return dto; return dto;
} }

4
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -795,7 +795,9 @@ export default {
this.data = response.data.data this.data = response.data.data
// console.log(JSON.stringify(this.chart)) // console.log(JSON.stringify(this.chart))
this.httpRequest.status = true this.httpRequest.status = true
this.param.privileges = this.chart.privileges if (this.chart.privileges) {
this.param.privileges = this.chart.privileges
}
}).catch(err => { }).catch(err => {
this.resetView() this.resetView()
this.httpRequest.status = err.response.data.success this.httpRequest.status = err.response.data.success