From 9c3d02995035cc6c84af517d7f2bf6c4339ca2fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=2EYing-=E5=BA=94=E5=BF=97=E6=B5=A9?=
 <John.Ying@fanruan.com>
Date: Fri, 10 Feb 2023 13:47:08 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-88426=20=E6=A8=A1=E6=9D=BF=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=92=8C=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E9=87=8D=E5=90=8D=E6=97=B6=EF=BC=8C=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=A8=A1=E6=9D=BF=E4=BC=9A=E9=94=99=E8=AF=AF=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/data/BasicTableDataTreePane.java  |  8 ++------
 .../fr/design/data/DesignTableDataManager.java  | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
index fa1fe545e..b3c090d54 100644
--- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
@@ -378,12 +378,8 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
 
     protected boolean isDsNameRepeaded(String name) {
         allDSNames = DesignTableDataManager.getAllDSNames(tc.getBook());
-        for (int i = 0; i < allDSNames.length; i++) {
-            if (ComparatorUtils.equals(name, allDSNames[i])) {
-                return true;
-            }
-        }
-        return false;
+        Set<String> allDSNamesWithoutPermissions = DesignTableDataManager.getAllDSNamesWithoutPermissions(tc.getBook());
+        return allDSNamesWithoutPermissions.contains(name);
     }
 
     protected KeyAdapter getTableTreeNodeListener(final UpdateAction editAction, final UpdateAction previewTableDataAction, final UpdateAction removeAction, final TableDataSourceOP op, final TableDataTree dataTree) {
diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
index e18b2a47d..536ce1f97 100644
--- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
+++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
@@ -48,6 +48,7 @@ import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -295,6 +296,22 @@ public abstract class DesignTableDataManager {
         return list.toArray(new String[0]);
     }
 
+    /**
+     * 获取所有的数据集名称,无论模板是不是有数据集的权限
+     */
+    public static Set<String> getAllDSNamesWithoutPermissions(TableDataSource source) {
+        Set<String> names = new HashSet<>();
+        String[] allDSNames = getAllDSNames(source);
+        Map<String, TableData> tableDatas = TableDataConfig.getInstance().getTableDatas();
+        for (String dsName : allDSNames) {
+            names.add(dsName);
+        }
+        for (Map.Entry<String, TableData> entry : tableDatas.entrySet()) {
+            names.add(entry.getKey());
+        }
+        return names;
+    }
+
     /**
      * 不根据过滤设置，返回当前模板数据集、服务器数据集、存储过程本身，是有顺序的
      */