From 241a3a1d0bfe57f5bff64e172934021c9b319c8c Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Fri, 15 May 2020 14:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E9=99=86=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/co/yixiang/modules/system/domain/Menu.java    | 2 +-
 .../co/yixiang/modules/system/service/mapper/MenuMapper.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java
index c2d2f592..9506793e 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java
@@ -83,7 +83,7 @@ public class Menu implements Serializable {
     private String permission;
 
 
-    /** 类型 */
+    /** 类型，目录、菜单、按钮 */
     private Integer type;
 
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/MenuMapper.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/MenuMapper.java
index 854db27c..c65fd5b5 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/MenuMapper.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/MenuMapper.java
@@ -37,6 +37,6 @@ public interface MenuMapper extends CoreMapper<Menu> {
 
     @Select("select m.* from menu m LEFT JOIN roles_menus t on m.id= t.menu_id LEFT JOIN role r on r.id = t.role_id where r.id = #{roleId}")
     Set<Menu> findMenuByRoleId(@Param("roleId") Long roleId);
-    @Select("<script>select m.* from menu m LEFT JOIN roles_menus t on m.id= t.menu_id LEFT JOIN role r on r.id = t.role_id where r.id in <foreach collection=\"roleIds\" index=\"index\" item=\"item\" open=\"(\" separator=\",\" close=\")\">#{item}</foreach></script>")
+    @Select("<script>select m.* from menu m LEFT OUTER JOIN roles_menus t on m.id= t.menu_id LEFT OUTER JOIN role r on r.id = t.role_id where m.type!=2 and  r.id in <foreach collection=\"roleIds\" index=\"index\" item=\"item\" open=\"(\" separator=\",\" close=\")\">#{item}</foreach> order by m.sort asc</script>")
     List<Menu> selectListByRoles(@Param("roleIds") List<Long> roleIds);
 }