From 834e6a7f48e97f941af5d7c284dbb454f8a850cd Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 21 May 2021 10:36:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.xml | 3 ++-
 backend/src/main/java/io/dataease/service/sys/MenuService.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.xml
index 5314bba41d..56e79e0b8a 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.xml
@@ -8,13 +8,14 @@
     </resultMap>
 
     <select id="allNodes" resultMap="simpleNode">
-        select menu_id as id, pid from sys_menu
+        select menu_id as id, pid from sys_menu where hidden != 1
     </select>
 
 
     <select id="nodesByExample" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="simpleNode">
         select menu_id as id, pid from sys_menu
         <include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
+        and hidden != 1
     </select>
 
 
diff --git a/backend/src/main/java/io/dataease/service/sys/MenuService.java b/backend/src/main/java/io/dataease/service/sys/MenuService.java
index 361d98d768..647ddd7ad7 100644
--- a/backend/src/main/java/io/dataease/service/sys/MenuService.java
+++ b/backend/src/main/java/io/dataease/service/sys/MenuService.java
@@ -157,7 +157,7 @@ public class MenuService {
     private MenuTreeNode format(SysMenu sysMenu) {
         MenuTreeNode menuTreeNode = new MenuTreeNode();
         menuTreeNode.setId(sysMenu.getMenuId());
-        menuTreeNode.setLabel(sysMenu.getName());
+        menuTreeNode.setLabel(sysMenu.getTitle());
         menuTreeNode.setHasChildren(false);
         Optional.ofNullable(sysMenu.getMenuSort()).ifPresent(num -> menuTreeNode.setHasChildren(num > 0));
         return menuTreeNode;