From 311760e212523d0d7b240cf58ba6cf53794df0fc Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 9 Aug 2018 22:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=8F=9C=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/ry_20180808.sql                                         | 2 +-
 .../java/com/ruoyi/project/system/menu/domain/Menu.java     | 6 +++---
 src/main/resources/mybatis/system/MenuMapper.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sql/ry_20180808.sql b/sql/ry_20180808.sql
index 66e400dc..2f17a922 100644
--- a/sql/ry_20180808.sql
+++ b/sql/ry_20180808.sql
@@ -133,7 +133,7 @@ create table sys_menu (
   order_num 		int(4) 			default null 			   comment '显示顺序',
   url 				varchar(200) 	default ''				   comment '请求地址',
   menu_type 		char(1) 		default '' 			       comment '菜单类型（M目录 C菜单 F按钮）',
-  visible 			char(1) 		default 0 				   comment '菜单状态（0显示 1隐藏）',
+  visible 			char(1) 		not null 				   comment '菜单状态（0显示 1隐藏）',
   perms 			varchar(100) 	default '' 				   comment '权限标识',
   icon 				varchar(100) 	default '' 				   comment '菜单图标',
   create_by         varchar(64)     default ''                 comment '创建者',
diff --git a/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java b/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java
index dec62f4d..0f264daa 100644
--- a/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java
+++ b/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java
@@ -27,7 +27,7 @@ public class Menu extends BaseEntity
     /** 类型:0目录,1菜单,2按钮 */
     private String menuType;
     /** 菜单状态:0显示,1隐藏 */
-    private Integer visible;
+    private String visible;
     /** 权限字符串 */
     private String perms;
     /** 菜单图标 */
@@ -105,12 +105,12 @@ public class Menu extends BaseEntity
         this.menuType = menuType;
     }
 
-    public Integer getVisible()
+    public String getVisible()
     {
         return visible;
     }
 
-    public void setVisible(Integer visible)
+    public void setVisible(String visible)
     {
         this.visible = visible;
     }
diff --git a/src/main/resources/mybatis/system/MenuMapper.xml b/src/main/resources/mybatis/system/MenuMapper.xml
index 187315d4..05af46d2 100644
--- a/src/main/resources/mybatis/system/MenuMapper.xml
+++ b/src/main/resources/mybatis/system/MenuMapper.xml
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="menuName != null and menuName != ''">
 				AND menu_name like concat('%', #{menuName}, '%')
 			</if>
-			<if test="visible != null">
+			<if test="visible != null and visible != ''">
 				AND visible = #{visible}
 			</if>
 		</where>