fubojin 1 сар өмнө
parent
commit
02ed567992

+ 15 - 5
yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysMenu.java

@@ -23,13 +23,13 @@ import java.util.List;
 
 /**
  * 菜单管理
- * 
+ *
  */
 @Data
 @TableName("tz_sys_menu")
 public class SysMenu implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
+
 	/**
 	 * 菜单ID
 	 */
@@ -41,13 +41,13 @@ public class SysMenu implements Serializable {
 	 */
 	@NotNull(message="上级菜单不能为空")
 	private Long parentId;
-	
+
 	/**
 	 * 父菜单名称
 	 */
 	@TableField(exist=false)
 	private String parentName;
-	
+
 	/**
 	 * 菜单名称
 	 */
@@ -74,11 +74,21 @@ public class SysMenu implements Serializable {
 	 */
 	private String icon;
 
+	/**
+	 * 菜单图标
+	 */
+	private String component;
+
+	/**
+	 * 菜单图标
+	 */
+	private boolean hideInMenu;
+
 	/**
 	 * 排序
 	 */
 	private Integer orderNum;
-	
+
 	@TableField(exist=false)
 	private List<?> list;
 

+ 10 - 10
yami-shop-sys/src/main/resources/mapper/SysMenuMapper.xml

@@ -6,31 +6,31 @@
 	<select id="listMenuIdByRoleId" resultType="Long">
 		select menu_id from tz_sys_role_menu where role_id = #{roleId}
 	</select>
-	
-	<!-- 查询用户的所有菜单 --> 
+
+	<!-- 查询用户的所有菜单 -->
 	<select id="listMenuByUserId" resultType="com.yami.shop.sys.model.SysMenu">
-		SELECT DISTINCT m.menu_id AS menu_id,m.parent_id,m.name,url,m.type,m.icon,m.order_num FROM tz_sys_user_role ur 
+		SELECT DISTINCT m.menu_id AS menu_id,m.parent_id,m.name,url,m.type,m.icon,m.hideln_menu,m.component,m.order_num FROM tz_sys_user_role ur
 			LEFT JOIN tz_sys_role_menu rm ON ur.role_id = rm.role_id LEFT JOIN tz_sys_menu m ON m.`menu_id` = rm.`menu_id`
 		WHERE  ur.user_id = #{userId} and m.type != 2 order by order_num
 	</select>
-	<!-- 查询所有菜单 --> 
+	<!-- 查询所有菜单 -->
 	<select id="listMenu" resultType="com.yami.shop.sys.model.SysMenu">
 		select * from tz_sys_menu where `type` != 2 order by order_num
 	</select>
-	
+
 	<select id="listSimpleMenuNoButton" resultType="com.yami.shop.sys.model.SysMenu">
-		select menu_id ,parent_id ,`name` from tz_sys_menu where `type` != 2 order by order_num 
+		select menu_id ,parent_id ,`name` from tz_sys_menu where `type` != 2 order by order_num
 	</select>
-	
+
 	<select id="listRootMenu" resultType="com.yami.shop.sys.model.SysMenu">
 		select menu_id,`name` from tz_sys_menu where `type` = 0
 	</select>
-	
+
 	<select id="listChildrenMenuByParentId" resultType="com.yami.shop.sys.model.SysMenu">
 		select menu_id,`name` from tz_sys_menu where parent_id = #{parentId}
 	</select>
-	
+
 	<select id="listMenuAndBtn" resultType="com.yami.shop.sys.model.SysMenu">
 	   select * from tz_sys_menu order by order_num
 	</select>
-</mapper>
+</mapper>