From 1bc7ea15f2032cc12effc0e4c1af9640d11b84fe Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sat, 29 Jan 2022 09:06:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=87=BA=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/mobile/service/DirService.java | 18 ++++++++++--------
 mobile/src/pages/tabBar/dir/search.vue         |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/dataease/mobile/service/DirService.java b/backend/src/main/java/io/dataease/mobile/service/DirService.java
index 79abaa2c7b..d280d2dd8e 100644
--- a/backend/src/main/java/io/dataease/mobile/service/DirService.java
+++ b/backend/src/main/java/io/dataease/mobile/service/DirService.java
@@ -12,16 +12,18 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
 public class DirService {
 
+    private static final String[] filterDirNames = { "i18n_panel_list", "i18n_default_panel" };
+
     @Resource
     private MobileDirMapper mobileDirMapper;
 
-
     public List<String> permissions() {
         CurrentUserDto user = AuthUtils.getUser();
         Long userId = user.getUserId();
@@ -43,13 +45,14 @@ public class DirService {
         String userId = String.valueOf(AuthUtils.getUser().getUserId());
         List<PanelEntity> panelEntities = new ArrayList<>();
         if (StringUtils.isNotBlank(request.getName())) {
-            panelEntities = mobileDirMapper.queryWithName(request.getName(),userId);
-        }else {
-            panelEntities = mobileDirMapper.query(request.getPid(),userId);
+            panelEntities = mobileDirMapper.queryWithName(request.getName(), userId);
+        } else {
+            panelEntities = mobileDirMapper.query(request.getPid(), userId);
         }
-        if (CollectionUtils.isEmpty(panelEntities)) return null;
-
-        List<DirItemDTO> dtos = panelEntities.stream().map(data -> {
+        if (CollectionUtils.isEmpty(panelEntities))
+            return null;
+        List<String> filterLists = Arrays.asList(filterDirNames);
+        List<DirItemDTO> dtos = panelEntities.stream().filter(dto -> !filterLists.contains(dto.getText())).map(data -> {
             DirItemDTO dirItemDTO = new DirItemDTO();
             dirItemDTO.setId(data.getId());
             dirItemDTO.setText(data.getText());
@@ -63,5 +66,4 @@ public class DirService {
         return CommonBeanFactory.getBean(DirService.class);
     }
 
-
 }
diff --git a/mobile/src/pages/tabBar/dir/search.vue b/mobile/src/pages/tabBar/dir/search.vue
index 666f923f85..cc4cabc957 100644
--- a/mobile/src/pages/tabBar/dir/search.vue
+++ b/mobile/src/pages/tabBar/dir/search.vue
@@ -89,7 +89,7 @@ export default {
             const param = {name: val}
             requestDir(param).then(res => {
                 let dataObj = res.data
-                dataObj.map(item => {
+                dataObj && dataObj.map(item => {
                     item.name = item.text
                     return util.dataHandle(item, val);
                 });