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

backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java

@@ -26,12 +26,14 @@ import java.util.stream.Collectors;
 public class DePermissionAnnotationHandler {
 
     @Around(value = "@annotation(io.dataease.auth.annotation.DePermissions)")
-    public Object PermissionsAround(ProceedingJoinPoint point) {
+    public Object PermissionsAround(ProceedingJoinPoint point) throws Throwable{
 
+        if (AuthUtils.getUser().getIsAdmin()) {
+            return point.proceed(point.getArgs());
+        }
+        Boolean access = false;
         try {
-            if (AuthUtils.getUser().getIsAdmin()) {
-                return point.proceed(point.getArgs());
-            }
+
             MethodSignature ms = (MethodSignature) point.getSignature();
             Method method = ms.getMethod();
             DePermissions annotation = method.getAnnotation(DePermissions.class);
@@ -43,37 +45,40 @@ public class DePermissionAnnotationHandler {
                     DePermission permission = dePermissions[i];
                     boolean currentAccess = access(args[permission.paramIndex()], permission, 0);
                     if (!currentAccess) {
-                        return null;
+                        access = false;
+                        break;
                     }
                 }
             } else {
                 List<Exception> exceptions = new ArrayList<>();
-                Boolean someAccess = false;
                 for (int i = 0; i < dePermissions.length; i++) {
                     DePermission permission = dePermissions[i];
                     try {
                         boolean currentAccess = access(args[permission.paramIndex()], permission, 0);
                         if (currentAccess) {
-                            someAccess = true;
+                            access = true;
                             break;
                         }
                     } catch (Exception e) {
                         exceptions.add(e);
                     }
                 }
-                if (!someAccess) {
+                if (!access && exceptions.size() > 0) {
                     throw exceptions.get(0);
                 }
             }
-            return point.proceed(point.getArgs());
+
         } catch (Throwable throwable) {
             LogUtil.error(throwable.getMessage(), throwable);
             throw new RuntimeException(throwable.getMessage());
         }
+
+        return access ? point.proceed(point.getArgs()) : null;
     }
 
     @Around(value = "@annotation(io.dataease.auth.annotation.DePermission)")
-    public Object PermissionAround(ProceedingJoinPoint point) {
+    public Object PermissionAround(ProceedingJoinPoint point) throws Throwable{
+        Boolean access = false;
         try {
             if (AuthUtils.getUser().getIsAdmin()) {
                 return point.proceed(point.getArgs());
@@ -84,14 +89,14 @@ public class DePermissionAnnotationHandler {
             DePermission annotation = method.getAnnotation(DePermission.class);
             Object arg = point.getArgs()[annotation.paramIndex()];
             if (access(arg, annotation, 0)) {
-                return point.proceed(point.getArgs());
+                access = true;
             }
-            return false;
-
         } catch (Throwable throwable) {
             LogUtil.error(throwable.getMessage(), throwable);
             throw new RuntimeException(throwable.getMessage());
         }
+
+        return access ? point.proceed(point.getArgs()) : null;
     }
 
     private Boolean access(Object arg, DePermission annotation, int layer) throws Exception {

backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java

@@ -42,7 +42,7 @@ public class DataSetGroupController {
     }, logical = Logical.AND)
     @ApiOperation("保存")
     @PostMapping("/save")
-    public DataSetGroupDTO save(@RequestBody DatasetGroup datasetGroup) {
+    public DataSetGroupDTO save(@RequestBody DatasetGroup datasetGroup) throws Exception {
         return dataSetGroupService.save(datasetGroup);
     }
 

backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java

@@ -44,7 +44,10 @@ public class DataSetGroupService {
     private SysAuthService sysAuthService;
 
     @DeCleaner(DePermissionType.DATASET)
-    public DataSetGroupDTO save(DatasetGroup datasetGroup) {
+    public DataSetGroupDTO save(DatasetGroup datasetGroup) throws Exception {
+        if (StringUtils.isEmpty(datasetGroup.getType())) {
+            throw new Exception("type can not be empty");
+        }
         checkName(datasetGroup);
         if (StringUtils.isEmpty(datasetGroup.getId())) {
             datasetGroup.setId(UUID.randomUUID().toString());
@@ -65,7 +68,7 @@ public class DataSetGroupService {
     public void delete(String id) throws Exception {
 
         Assert.notNull(id, "id cannot be null");
-        sysAuthService.checkTreeNoManageCount("dataset",id);
+        sysAuthService.checkTreeNoManageCount("dataset", id);
 
         DatasetGroup dg = datasetGroupMapper.selectByPrimaryKey(id);
         DataSetGroupRequest datasetGroup = new DataSetGroupRequest();

frontend/src/styles/index.scss

@@ -151,6 +151,7 @@ div:focus {
 
   .el-tabs__content {
     height: calc(100% - 55px) !important;
+    margin-top: 5px;
 
     .el-tab-pane {
       height: 100% !important;