From e760bdf5e1cc506b24feda6dacfa348cb48d6e2e Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 8 Nov 2024 10:07:08 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=A4=BE=E5=8C=BA=E7=89=88=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=AE=A2=E6=88=B7=E7=AB=AFIP=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/dataset/manage/DatasetDataManage.java |  1 +
 .../dataease/share/interceptor/LinkInterceptor.java   |  2 +-
 .../permissions/user/SubstituteUserServer.java        | 11 +++++++++++
 de-xpack                                              |  2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
index 1dc104bcdf..69703e730f 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
@@ -260,6 +260,7 @@ public class DatasetDataManage {
 
     public Long getDatasetTotal(Long datasetGroupId) throws Exception {
         DatasetGroupInfoDTO dto = datasetGroupManage.getForCount(datasetGroupId);
+        if (ObjectUtils.isEmpty(dto)) return 0L;
         if (StringUtils.equalsIgnoreCase(dto.getNodeType(), "dataset")) {
             return getDatasetTotal(dto, null, new ChartExtRequest());
         }
diff --git a/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java b/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java
index 01bed22e69..8cdebaf322 100644
--- a/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java
+++ b/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java
@@ -19,7 +19,7 @@ import java.util.List;
 @Component
 public class LinkInterceptor implements HandlerInterceptor {
 
-    private final static String whiteListText = "/user/ipInfo, /apisix/check, /datasetData/enumValue, /datasetData/enumValueObj, /datasetData/getFieldTree, /dekey, /share/validate, /sysParameter/queryOnlineMap";
+    private final static String whiteListText = "/user/ipInfo, /apisix/check, /datasetData/enumValue, /datasetData/enumValueObj, /datasetData/getFieldTree, /dekey, /share/validate, /sysParameter/queryOnlineMap, /chartData/innerExportDetails";
 
 
     @Override
diff --git a/core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java b/core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java
index 0015979364..1b64d68531 100644
--- a/core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java
+++ b/core/core-backend/src/main/java/io/dataease/substitute/permissions/user/SubstituteUserServer.java
@@ -1,6 +1,7 @@
 package io.dataease.substitute.permissions.user;
 
 
+import io.dataease.api.permissions.user.vo.CurIpVO;
 import io.dataease.api.permissions.user.vo.UserFormVO;
 import io.dataease.utils.IPUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -27,6 +28,7 @@ public class SubstituteUserServer {
         result.put("language", "zh-CN");
         return result;
     }
+
     @GetMapping("/personInfo")
     public UserFormVO personInfo() {
         UserFormVO userFormVO = new UserFormVO();
@@ -38,4 +40,13 @@ public class SubstituteUserServer {
         userFormVO.setModel("lose");
         return userFormVO;
     }
+
+    @GetMapping("/ipInfo")
+    public CurIpVO ipInfo() {
+        CurIpVO curIpVO = new CurIpVO();
+        curIpVO.setAccount("admin");
+        curIpVO.setName("管理员");
+        curIpVO.setIp(IPUtils.get());
+        return curIpVO;
+    }
 }
diff --git a/de-xpack b/de-xpack
index 53406012c4..a355248cac 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 53406012c49a8f108dad40f87b6963a729ae05dd
+Subproject commit a355248cac7b72ff99179f09e94e13c3bf09aff8