From 3d4e33c8cae194cb4918f4efe062ab08022607c3 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 2 Mar 2022 17:49:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=B6=EF=BC=8C=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E7=A9=BA=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/authModel/VAuthModelService.java  | 21 +++++--------------
 frontend/src/views/dataset/add/AddUnion.vue   |  4 ++--
 .../src/views/dataset/add/union/NodeItem.vue  |  6 +++---
 .../src/views/system/task/DatasetTaskList.vue |  2 +-
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java b/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java
index 7bb93527ac..6aeffd908a 100644
--- a/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java
+++ b/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java
@@ -26,14 +26,12 @@ public class VAuthModelService {
 
     public List<VAuthModelDTO> queryAuthModel(VAuthModelRequest request) {
         request.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
-        // 定时任务选数据集时，列表需去除空目录
-        if (request.isClearEmptyDir()) {
-            request.setMode(null);
-        }
         List<VAuthModelDTO> result = extVAuthModelMapper.queryAuthModel(request);
-        // 定时任务选数据集时，列表需去除空目录
+
+        if (request.getPrivileges() != null) {
+            result = filterPrivileges(request, result);
+        }
         if (request.isClearEmptyDir()) {
-            result = filterData(request, result);
             List<VAuthModelDTO> vAuthModelDTOS = TreeUtils.mergeTree(result);
             setAllLeafs(vAuthModelDTOS);
             removeEmptyDir(vAuthModelDTOS);
@@ -42,16 +40,7 @@ public class VAuthModelService {
         return TreeUtils.mergeTree(result);
     }
 
-    private List<VAuthModelDTO> filterData(VAuthModelRequest request, List<VAuthModelDTO> result) {
-        if (request.getDatasetMode() != null && request.getDatasetMode() == 1) {
-            result = result.stream().filter(vAuthModelDTO -> {
-                if (vAuthModelDTO.getNodeType().equalsIgnoreCase("spine") || (vAuthModelDTO.getNodeType().equalsIgnoreCase("leaf") && vAuthModelDTO.getMode().equals(1L)) && !vAuthModelDTO.getModelInnerType().equalsIgnoreCase("excel") && !vAuthModelDTO.getModelInnerType().equalsIgnoreCase("custom") && !vAuthModelDTO.getModelInnerType().equalsIgnoreCase("union")) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }).collect(Collectors.toList());
-        }
+    private List<VAuthModelDTO> filterPrivileges(VAuthModelRequest request, List<VAuthModelDTO> result) {
         if (request.getPrivileges() != null) {
             result = result.stream().filter(vAuthModelDTO -> {
                 if (vAuthModelDTO.getNodeType().equalsIgnoreCase("spine") || (vAuthModelDTO.getNodeType().equalsIgnoreCase("leaf") && vAuthModelDTO.getPrivileges() != null && vAuthModelDTO.getPrivileges().contains(request.getPrivileges()))) {
diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue
index 83212808f6..5d73a9ae08 100644
--- a/frontend/src/views/dataset/add/AddUnion.vue
+++ b/frontend/src/views/dataset/add/AddUnion.vue
@@ -60,7 +60,7 @@
 
     <!--选择数据集-->
     <el-dialog v-if="selectDsDialog" v-dialogDrag :title="$t('chart.select_dataset')" :visible="selectDsDialog" :show-close="false" width="400px" class="dialog-css">
-      <dataset-group-selector-tree :fix-height="true" show-mode="union" :custom-type="customType" @getTable="firstDs" />
+      <dataset-group-selector-tree :fix-height="true" show-mode="union" :custom-type="customType" clear-empty-dir="true" @getTable="firstDs" />
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeSelectDs()">{{ $t('dataset.cancel') }}</el-button>
         <el-button :disabled="!tempDs.id" type="primary" size="mini" @click="confirmSelectDs()">{{ $t('dataset.confirm') }}</el-button>
@@ -185,7 +185,7 @@ export default {
         mode: this.dataset[0].currentDs.mode,
         info: '{"union":' + JSON.stringify(this.dataset) + '}'
       }
-      post('/dataset/table/update', table).then(response => {
+      post('/dataset/table/updateUnion', table).then(response => {
         this.$emit('saveSuccess', table)
         this.cancel()
       })
diff --git a/frontend/src/views/dataset/add/union/NodeItem.vue b/frontend/src/views/dataset/add/union/NodeItem.vue
index fb4d005750..e5857135f6 100644
--- a/frontend/src/views/dataset/add/union/NodeItem.vue
+++ b/frontend/src/views/dataset/add/union/NodeItem.vue
@@ -29,7 +29,7 @@
 
     <!--选择数据集-->
     <el-dialog v-if="selectDsDialog" v-dialogDrag :title="$t('chart.select_dataset')" :visible="selectDsDialog" :show-close="false" width="400px" class="dialog-css">
-      <dataset-group-selector-tree :fix-height="true" show-mode="union" :custom-type="customType" :mode="currentNode.currentDs.mode" @getTable="firstDs" />
+      <dataset-group-selector-tree :fix-height="true" show-mode="union" :custom-type="customType" clear-empty-dir="true" :mode="currentNode.currentDs.mode" @getTable="firstDs" />
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeSelectDs()">{{ $t('dataset.cancel') }}</el-button>
         <el-button :disabled="!tempDs.id" type="primary" size="mini" @click="confirmSelectDs()">{{ $t('dataset.confirm') }}</el-button>
@@ -79,7 +79,7 @@ export default {
         },
         allChildCount: 0
       },
-      customType: ['db', 'sql', 'excel'],
+      customType: ['db', 'sql', 'excel', 'api'],
       selectDsDialog: false,
       // 弹框临时选中的数据集
       tempDs: {},
@@ -129,7 +129,7 @@ export default {
     selectDs() {
       // 根据父级node，过滤不同的数据集
       if (this.currentNode.currentDs.mode === 1) {
-        this.customType = ['db', 'sql', 'excel']
+        this.customType = ['db', 'sql', 'excel', 'api']
       } else if (this.currentNode.currentDs.mode === 0) {
         if (this.currentNode.currentDs.modelInnerType === 'db') {
           this.customType = ['db']
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index 9021126c82..3fd288f7db 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -340,7 +340,7 @@ export default {
           { required: true, message: this.$t('dataset.required'), trigger: 'change' }
         ]
       },
-      customType: ['db', 'sql']
+      customType: ['db', 'sql', 'api']
     }
   },
   computed: {