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

backend/src/main/java/io/dataease/controller/chart/ChartViewController.java

 package io.dataease.controller.chart;
 
 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.ChartViewRequest;
 import io.dataease.dto.chart.ChartViewDTO;
@@ -68,6 +69,12 @@ public class ChartViewController {
 
     @PostMapping("/getOneWithPermission/{id}")
     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;
     }
 }

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

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

frontend/src/views/chart/view/ChartEdit.vue

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