欧阳子桐 / RuoYi · 提交

转到一个项目

作者 RuoYi
提交 ec98648e4d2e25c1946f3664e9cab169d4e5b092 1 个父辈 5d20be29

菜单区分状态和显示隐藏功能

内嵌 并排对比
正在显示 7 个修改的文件 包含 159 行增加 和 109 行删除
@@ -11,9 +11,9 @@ @@ -11,9 +11,9 @@
11 /> 11 />
12 </el-form-item> 12 </el-form-item>
13 <el-form-item label="状态"> 13 <el-form-item label="状态">
14 - <el-select v-model="queryParams.visible" placeholder="菜单状态" clearable size="small"> 14 + <el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small">
15 <el-option 15 <el-option
16 - v-for="dict in visibleOptions" 16 + v-for="dict in statusOptions"
17 :key="dict.dictValue" 17 :key="dict.dictValue"
18 :label="dict.dictLabel" 18 :label="dict.dictLabel"
19 :value="dict.dictValue" 19 :value="dict.dictValue"
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <el-table-column prop="orderNum" label="排序" width="60"></el-table-column> 41 <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
42 <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column> 42 <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
43 <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column> 43 <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
44 - <el-table-column prop="visible" label="可见" :formatter="visibleFormat" width="80"></el-table-column> 44 + <el-table-column prop="status" label="状态" :formatter="statusFormat" width="80"></el-table-column>
45 <el-table-column label="创建时间" align="center" prop="createTime"> 45 <el-table-column label="创建时间" align="center" prop="createTime">
46 <template slot-scope="scope"> 46 <template slot-scope="scope">
47 <span>{{ parseTime(scope.row.createTime) }}</span> 47 <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -152,8 +152,8 @@ @@ -152,8 +152,8 @@
152 <el-input v-model="form.perms" placeholder="请权限标识" maxlength="50" /> 152 <el-input v-model="form.perms" placeholder="请权限标识" maxlength="50" />
153 </el-form-item> 153 </el-form-item>
154 </el-col> 154 </el-col>
155 - <el-col :span="24">  
156 - <el-form-item v-if="form.menuType != 'F'" label="菜单状态"> 155 + <el-col :span="12">
  156 + <el-form-item v-if="form.menuType != 'F'" label="显示状态">
157 <el-radio-group v-model="form.visible"> 157 <el-radio-group v-model="form.visible">
158 <el-radio 158 <el-radio
159 v-for="dict in visibleOptions" 159 v-for="dict in visibleOptions"
@@ -163,6 +163,17 @@ @@ -163,6 +163,17 @@
163 </el-radio-group> 163 </el-radio-group>
164 </el-form-item> 164 </el-form-item>
165 </el-col> 165 </el-col>
  166 + <el-col :span="12">
  167 + <el-form-item v-if="form.menuType != 'F'" label="菜单状态">
  168 + <el-radio-group v-model="form.status">
  169 + <el-radio
  170 + v-for="dict in statusOptions"
  171 + :key="dict.dictValue"
  172 + :label="dict.dictValue"
  173 + >{{dict.dictLabel}}</el-radio>
  174 + </el-radio-group>
  175 + </el-form-item>
  176 + </el-col>
166 </el-row> 177 </el-row>
167 </el-form> 178 </el-form>
168 <div slot="footer" class="dialog-footer"> 179 <div slot="footer" class="dialog-footer">
@@ -194,8 +205,10 @@ export default { @@ -194,8 +205,10 @@ export default {
194 title: "", 205 title: "",
195 // 是否显示弹出层 206 // 是否显示弹出层
196 open: false, 207 open: false,
197 - // 菜单状态数据字典 208 + // 显示状态数据字典
198 visibleOptions: [], 209 visibleOptions: [],
  210 + // 菜单状态数据字典
  211 + statusOptions: [],
199 // 查询参数 212 // 查询参数
200 queryParams: { 213 queryParams: {
201 menuName: undefined, 214 menuName: undefined,
@@ -222,6 +235,9 @@ export default { @@ -222,6 +235,9 @@ export default {
222 this.getDicts("sys_show_hide").then(response => { 235 this.getDicts("sys_show_hide").then(response => {
223 this.visibleOptions = response.data; 236 this.visibleOptions = response.data;
224 }); 237 });
  238 + this.getDicts("sys_normal_disable").then(response => {
  239 + this.statusOptions = response.data;
  240 + });
225 }, 241 },
226 methods: { 242 methods: {
227 // 选择图标 243 // 选择图标
@@ -256,13 +272,20 @@ export default { @@ -256,13 +272,20 @@ export default {
256 this.menuOptions.push(menu); 272 this.menuOptions.push(menu);
257 }); 273 });
258 }, 274 },
259 - // 菜单显示状态字典翻译 275 + // 显示状态字典翻译
260 visibleFormat(row, column) { 276 visibleFormat(row, column) {
261 if (row.menuType == "F") { 277 if (row.menuType == "F") {
262 return ""; 278 return "";
263 } 279 }
264 return this.selectDictLabel(this.visibleOptions, row.visible); 280 return this.selectDictLabel(this.visibleOptions, row.visible);
265 }, 281 },
  282 + // 菜单状态字典翻译
  283 + statusFormat(row, column) {
  284 + if (row.menuType == "F") {
  285 + return "";
  286 + }
  287 + return this.selectDictLabel(this.statusOptions, row.status);
  288 + },
266 // 取消按钮 289 // 取消按钮
267 cancel() { 290 cancel() {
268 this.open = false; 291 this.open = false;
@@ -278,7 +301,8 @@ export default { @@ -278,7 +301,8 @@ export default {
278 menuType: "M", 301 menuType: "M",
279 orderNum: undefined, 302 orderNum: undefined,
280 isFrame: "1", 303 isFrame: "1",
281 - visible: "0" 304 + visible: "0",
  305 + status: "0"
282 }; 306 };
283 this.resetForm("form"); 307 this.resetForm("form");
284 }, 308 },
@@ -138,6 +138,7 @@ create table sys_menu ( @@ -138,6 +138,7 @@ create table sys_menu (
138 is_frame int(1) default 1 comment '是否为外链（0是 1否）', 138 is_frame int(1) default 1 comment '是否为外链（0是 1否）',
139 menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）', 139 menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）',
140 visible char(1) default 0 comment '菜单状态（0显示 1隐藏）', 140 visible char(1) default 0 comment '菜单状态（0显示 1隐藏）',
  141 + status char(1) not null comment '菜单状态（0正常 1停用）',
141 perms varchar(100) default null comment '权限标识', 142 perms varchar(100) default null comment '权限标识',
142 icon varchar(100) default '#' comment '菜单图标', 143 icon varchar(100) default '#' comment '菜单图标',
143 create_by varchar(64) default '' comment '创建者', 144 create_by varchar(64) default '' comment '创建者',
@@ -152,103 +153,103 @@ create table sys_menu ( @@ -152,103 +153,103 @@ create table sys_menu (
152 -- 初始化-菜单信息表数据 153 -- 初始化-菜单信息表数据
153 -- ---------------------------- 154 -- ----------------------------
154 -- 一级菜单 155 -- 一级菜单
155 -insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, 1, 'M', '0', '', 'system', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统管理目录');  
156 -insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, 1, 'M', '0', '', 'monitor', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统监控目录');  
157 -insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, 1, 'M', '0', '', 'tool', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统工具目录');  
158 -insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null , 0, 'M', '0', '', 'guide', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '若依官网地址'); 156 +insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, 1, 'M', '0', '0', '', 'system', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统管理目录');
  157 +insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, 1, 'M', '0', '0', '', 'monitor', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统监控目录');
  158 +insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, 1, 'M', '0', '0', '', 'tool', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统工具目录');
  159 +insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null , 0, 'M', '0', '0', '', 'guide', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '若依官网地址');
159 -- 二级菜单 160 -- 二级菜单
160 -insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', 1, 'C', '0', 'system:user:list', 'user', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '用户管理菜单');  
161 -insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', 1, 'C', '0', 'system:role:list', 'peoples', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '角色管理菜单');  
162 -insert into sys_menu values('102', '菜单管理', '1', '3', 'menu', 'system/menu/index', 1, 'C', '0', 'system:menu:list', 'tree-table', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '菜单管理菜单');  
163 -insert into sys_menu values('103', '部门管理', '1', '4', 'dept', 'system/dept/index', 1, 'C', '0', 'system:dept:list', 'tree', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '部门管理菜单');  
164 -insert into sys_menu values('104', '岗位管理', '1', '5', 'post', 'system/post/index', 1, 'C', '0', 'system:post:list', 'post', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '岗位管理菜单');  
165 -insert into sys_menu values('105', '字典管理', '1', '6', 'dict', 'system/dict/index', 1, 'C', '0', 'system:dict:list', 'dict', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '字典管理菜单');  
166 -insert into sys_menu values('106', '参数设置', '1', '7', 'config', 'system/config/index', 1, 'C', '0', 'system:config:list', 'edit', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '参数设置菜单');  
167 -insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 'system/notice/index', 1, 'C', '0', 'system:notice:list', 'message', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '通知公告菜单');  
168 -insert into sys_menu values('108', '日志管理', '1', '9', 'log', 'system/log/index', 1, 'M', '0', '', 'log', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '日志管理菜单');  
169 -insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', 1, 'C', '0', 'monitor:online:list', 'online', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '在线用户菜单');  
170 -insert into sys_menu values('110', '定时任务', '2', '2', 'job', 'monitor/job/index', 1, 'C', '0', 'monitor:job:list', 'job', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '定时任务菜单');  
171 -insert into sys_menu values('111', '数据监控', '2', '3', 'druid', 'monitor/druid/index', 1, 'C', '0', 'monitor:druid:list', 'druid', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '数据监控菜单');  
172 -insert into sys_menu values('112', '服务监控', '2', '4', 'server', 'monitor/server/index', 1, 'C', '0', 'monitor:server:list', 'server', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '服务监控菜单');  
173 -insert into sys_menu values('113', '表单构建', '3', '1', 'build', 'tool/build/index', 1 ,'C', '0', 'tool:build:list', 'build', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '表单构建菜单');  
174 -insert into sys_menu values('114', '代码生成', '3', '2', 'gen', 'tool/gen/index', 1, 'C', '0', 'tool:gen:list', 'code', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '代码生成菜单');  
175 -insert into sys_menu values('115', '系统接口', '3', '3', 'swagger', 'tool/swagger/index', 1, 'C', '0', 'tool:swagger:list', 'swagger', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统接口菜单'); 161 +insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', 1, 'C', '0', '0', 'system:user:list', 'user', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '用户管理菜单');
  162 +insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', 1, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '角色管理菜单');
  163 +insert into sys_menu values('102', '菜单管理', '1', '3', 'menu', 'system/menu/index', 1, 'C', '0', '0', 'system:menu:list', 'tree-table', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '菜单管理菜单');
  164 +insert into sys_menu values('103', '部门管理', '1', '4', 'dept', 'system/dept/index', 1, 'C', '0', '0', 'system:dept:list', 'tree', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '部门管理菜单');
  165 +insert into sys_menu values('104', '岗位管理', '1', '5', 'post', 'system/post/index', 1, 'C', '0', '0', 'system:post:list', 'post', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '岗位管理菜单');
  166 +insert into sys_menu values('105', '字典管理', '1', '6', 'dict', 'system/dict/index', 1, 'C', '0', '0', 'system:dict:list', 'dict', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '字典管理菜单');
  167 +insert into sys_menu values('106', '参数设置', '1', '7', 'config', 'system/config/index', 1, 'C', '0', '0', 'system:config:list', 'edit', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '参数设置菜单');
  168 +insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 'system/notice/index', 1, 'C', '0', '0', 'system:notice:list', 'message', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '通知公告菜单');
  169 +insert into sys_menu values('108', '日志管理', '1', '9', 'log', 'system/log/index', 1, 'M', '0', '0', '', 'log', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '日志管理菜单');
  170 +insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', 1, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '在线用户菜单');
  171 +insert into sys_menu values('110', '定时任务', '2', '2', 'job', 'monitor/job/index', 1, 'C', '0', '0', 'monitor:job:list', 'job', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '定时任务菜单');
  172 +insert into sys_menu values('111', '数据监控', '2', '3', 'druid', 'monitor/druid/index', 1, 'C', '0', '0', 'monitor:druid:list', 'druid', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '数据监控菜单');
  173 +insert into sys_menu values('112', '服务监控', '2', '4', 'server', 'monitor/server/index', 1, 'C', '0', '0', 'monitor:server:list', 'server', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '服务监控菜单');
  174 +insert into sys_menu values('113', '表单构建', '3', '1', 'build', 'tool/build/index', 1 ,'C', '0', '0', 'tool:build:list', 'build', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '表单构建菜单');
  175 +insert into sys_menu values('114', '代码生成', '3', '2', 'gen', 'tool/gen/index', 1, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '代码生成菜单');
  176 +insert into sys_menu values('115', '系统接口', '3', '3', 'swagger', 'tool/swagger/index', 1, 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统接口菜单');
176 -- 三级菜单 177 -- 三级菜单
177 -insert into sys_menu values('500', '操作日志', '108', '1', 'operlog', 'monitor/operlog/index', 1, 'C', '0', 'monitor:operlog:list', 'form', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '操作日志菜单');  
178 -insert into sys_menu values('501', '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', 1, 'C', '0', 'monitor:logininfor:list', 'logininfor', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '登录日志菜单'); 178 +insert into sys_menu values('500', '操作日志', '108', '1', 'operlog', 'monitor/operlog/index', 1, 'C', '0', '0', 'monitor:operlog:list', 'form', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '操作日志菜单');
  179 +insert into sys_menu values('501', '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', 1, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '登录日志菜单');
179 -- 用户管理按钮 180 -- 用户管理按钮
180 -insert into sys_menu values('1001', '用户查询', '100', '1', '', '', 1, 'F', '0', 'system:user:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
181 -insert into sys_menu values('1002', '用户新增', '100', '2', '', '', 1, 'F', '0', 'system:user:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
182 -insert into sys_menu values('1003', '用户修改', '100', '3', '', '', 1, 'F', '0', 'system:user:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
183 -insert into sys_menu values('1004', '用户删除', '100', '4', '', '', 1, 'F', '0', 'system:user:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
184 -insert into sys_menu values('1005', '用户导出', '100', '5', '', '', 1, 'F', '0', 'system:user:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
185 -insert into sys_menu values('1006', '用户导入', '100', '6', '', '', 1, 'F', '0', 'system:user:import', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
186 -insert into sys_menu values('1007', '重置密码', '100', '7', '', '', 1, 'F', '0', 'system:user:resetPwd', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 181 +insert into sys_menu values('1001', '用户查询', '100', '1', '', '', 1, 'F', '0', '0', 'system:user:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  182 +insert into sys_menu values('1002', '用户新增', '100', '2', '', '', 1, 'F', '0', '0', 'system:user:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  183 +insert into sys_menu values('1003', '用户修改', '100', '3', '', '', 1, 'F', '0', '0', 'system:user:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  184 +insert into sys_menu values('1004', '用户删除', '100', '4', '', '', 1, 'F', '0', '0', 'system:user:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  185 +insert into sys_menu values('1005', '用户导出', '100', '5', '', '', 1, 'F', '0', '0', 'system:user:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  186 +insert into sys_menu values('1006', '用户导入', '100', '6', '', '', 1, 'F', '0', '0', 'system:user:import', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  187 +insert into sys_menu values('1007', '重置密码', '100', '7', '', '', 1, 'F', '0', '0', 'system:user:resetPwd', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
187 -- 角色管理按钮 188 -- 角色管理按钮
188 -insert into sys_menu values('1008', '角色查询', '101', '1', '', '', 1, 'F', '0', 'system:role:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
189 -insert into sys_menu values('1009', '角色新增', '101', '2', '', '', 1, 'F', '0', 'system:role:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
190 -insert into sys_menu values('1010', '角色修改', '101', '3', '', '', 1, 'F', '0', 'system:role:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
191 -insert into sys_menu values('1011', '角色删除', '101', '4', '', '', 1, 'F', '0', 'system:role:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
192 -insert into sys_menu values('1012', '角色导出', '101', '5', '', '', 1, 'F', '0', 'system:role:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 189 +insert into sys_menu values('1008', '角色查询', '101', '1', '', '', 1, 'F', '0', '0', 'system:role:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  190 +insert into sys_menu values('1009', '角色新增', '101', '2', '', '', 1, 'F', '0', '0', 'system:role:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  191 +insert into sys_menu values('1010', '角色修改', '101', '3', '', '', 1, 'F', '0', '0', 'system:role:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  192 +insert into sys_menu values('1011', '角色删除', '101', '4', '', '', 1, 'F', '0', '0', 'system:role:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  193 +insert into sys_menu values('1012', '角色导出', '101', '5', '', '', 1, 'F', '0', '0', 'system:role:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
193 -- 菜单管理按钮 194 -- 菜单管理按钮
194 -insert into sys_menu values('1013', '菜单查询', '102', '1', '', '', 1, 'F', '0', 'system:menu:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
195 -insert into sys_menu values('1014', '菜单新增', '102', '2', '', '', 1, 'F', '0', 'system:menu:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
196 -insert into sys_menu values('1015', '菜单修改', '102', '3', '', '', 1, 'F', '0', 'system:menu:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
197 -insert into sys_menu values('1016', '菜单删除', '102', '4', '', '', 1, 'F', '0', 'system:menu:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 195 +insert into sys_menu values('1013', '菜单查询', '102', '1', '', '', 1, 'F', '0', '0', 'system:menu:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  196 +insert into sys_menu values('1014', '菜单新增', '102', '2', '', '', 1, 'F', '0', '0', 'system:menu:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  197 +insert into sys_menu values('1015', '菜单修改', '102', '3', '', '', 1, 'F', '0', '0', 'system:menu:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  198 +insert into sys_menu values('1016', '菜单删除', '102', '4', '', '', 1, 'F', '0', '0', 'system:menu:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
198 -- 部门管理按钮 199 -- 部门管理按钮
199 -insert into sys_menu values('1017', '部门查询', '103', '1', '', '', 1, 'F', '0', 'system:dept:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
200 -insert into sys_menu values('1018', '部门新增', '103', '2', '', '', 1, 'F', '0', 'system:dept:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
201 -insert into sys_menu values('1019', '部门修改', '103', '3', '', '', 1, 'F', '0', 'system:dept:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
202 -insert into sys_menu values('1020', '部门删除', '103', '4', '', '', 1, 'F', '0', 'system:dept:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 200 +insert into sys_menu values('1017', '部门查询', '103', '1', '', '', 1, 'F', '0', '0', 'system:dept:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  201 +insert into sys_menu values('1018', '部门新增', '103', '2', '', '', 1, 'F', '0', '0', 'system:dept:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  202 +insert into sys_menu values('1019', '部门修改', '103', '3', '', '', 1, 'F', '0', '0', 'system:dept:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  203 +insert into sys_menu values('1020', '部门删除', '103', '4', '', '', 1, 'F', '0', '0', 'system:dept:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
203 -- 岗位管理按钮 204 -- 岗位管理按钮
204 -insert into sys_menu values('1021', '岗位查询', '104', '1', '', '', 1, 'F', '0', 'system:post:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
205 -insert into sys_menu values('1022', '岗位新增', '104', '2', '', '', 1, 'F', '0', 'system:post:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
206 -insert into sys_menu values('1023', '岗位修改', '104', '3', '', '', 1, 'F', '0', 'system:post:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
207 -insert into sys_menu values('1024', '岗位删除', '104', '4', '', '', 1, 'F', '0', 'system:post:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
208 -insert into sys_menu values('1025', '岗位导出', '104', '5', '', '', 1, 'F', '0', 'system:post:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 205 +insert into sys_menu values('1021', '岗位查询', '104', '1', '', '', 1, 'F', '0', '0', 'system:post:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  206 +insert into sys_menu values('1022', '岗位新增', '104', '2', '', '', 1, 'F', '0', '0', 'system:post:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  207 +insert into sys_menu values('1023', '岗位修改', '104', '3', '', '', 1, 'F', '0', '0', 'system:post:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  208 +insert into sys_menu values('1024', '岗位删除', '104', '4', '', '', 1, 'F', '0', '0', 'system:post:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  209 +insert into sys_menu values('1025', '岗位导出', '104', '5', '', '', 1, 'F', '0', '0', 'system:post:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
209 -- 字典管理按钮 210 -- 字典管理按钮
210 -insert into sys_menu values('1026', '字典查询', '105', '1', '#', '', 1, 'F', '0', 'system:dict:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
211 -insert into sys_menu values('1027', '字典新增', '105', '2', '#', '', 1, 'F', '0', 'system:dict:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
212 -insert into sys_menu values('1028', '字典修改', '105', '3', '#', '', 1, 'F', '0', 'system:dict:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
213 -insert into sys_menu values('1029', '字典删除', '105', '4', '#', '', 1, 'F', '0', 'system:dict:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
214 -insert into sys_menu values('1030', '字典导出', '105', '5', '#', '', 1, 'F', '0', 'system:dict:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 211 +insert into sys_menu values('1026', '字典查询', '105', '1', '#', '', 1, 'F', '0', '0', 'system:dict:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  212 +insert into sys_menu values('1027', '字典新增', '105', '2', '#', '', 1, 'F', '0', '0', 'system:dict:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  213 +insert into sys_menu values('1028', '字典修改', '105', '3', '#', '', 1, 'F', '0', '0', 'system:dict:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  214 +insert into sys_menu values('1029', '字典删除', '105', '4', '#', '', 1, 'F', '0', '0', 'system:dict:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  215 +insert into sys_menu values('1030', '字典导出', '105', '5', '#', '', 1, 'F', '0', '0', 'system:dict:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
215 -- 参数设置按钮 216 -- 参数设置按钮
216 -insert into sys_menu values('1031', '参数查询', '106', '1', '#', '', 1, 'F', '0', 'system:config:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
217 -insert into sys_menu values('1032', '参数新增', '106', '2', '#', '', 1, 'F', '0', 'system:config:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
218 -insert into sys_menu values('1033', '参数修改', '106', '3', '#', '', 1, 'F', '0', 'system:config:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
219 -insert into sys_menu values('1034', '参数删除', '106', '4', '#', '', 1, 'F', '0', 'system:config:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
220 -insert into sys_menu values('1035', '参数导出', '106', '5', '#', '', 1, 'F', '0', 'system:config:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 217 +insert into sys_menu values('1031', '参数查询', '106', '1', '#', '', 1, 'F', '0', '0', 'system:config:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  218 +insert into sys_menu values('1032', '参数新增', '106', '2', '#', '', 1, 'F', '0', '0', 'system:config:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  219 +insert into sys_menu values('1033', '参数修改', '106', '3', '#', '', 1, 'F', '0', '0', 'system:config:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  220 +insert into sys_menu values('1034', '参数删除', '106', '4', '#', '', 1, 'F', '0', '0', 'system:config:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  221 +insert into sys_menu values('1035', '参数导出', '106', '5', '#', '', 1, 'F', '0', '0', 'system:config:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
221 -- 通知公告按钮 222 -- 通知公告按钮
222 -insert into sys_menu values('1036', '公告查询', '107', '1', '#', '', 1, 'F', '0', 'system:notice:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
223 -insert into sys_menu values('1037', '公告新增', '107', '2', '#', '', 1, 'F', '0', 'system:notice:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
224 -insert into sys_menu values('1038', '公告修改', '107', '3', '#', '', 1, 'F', '0', 'system:notice:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
225 -insert into sys_menu values('1039', '公告删除', '107', '4', '#', '', 1, 'F', '0', 'system:notice:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 223 +insert into sys_menu values('1036', '公告查询', '107', '1', '#', '', 1, 'F', '0', '0', 'system:notice:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  224 +insert into sys_menu values('1037', '公告新增', '107', '2', '#', '', 1, 'F', '0', '0', 'system:notice:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  225 +insert into sys_menu values('1038', '公告修改', '107', '3', '#', '', 1, 'F', '0', '0', 'system:notice:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  226 +insert into sys_menu values('1039', '公告删除', '107', '4', '#', '', 1, 'F', '0', '0', 'system:notice:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
226 -- 操作日志按钮 227 -- 操作日志按钮
227 -insert into sys_menu values('1040', '操作查询', '500', '1', '#', '', 1, 'F', '0', 'monitor:operlog:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
228 -insert into sys_menu values('1041', '操作删除', '500', '2', '#', '', 1, 'F', '0', 'monitor:operlog:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
229 -insert into sys_menu values('1042', '日志导出', '500', '4', '#', '', 1, 'F', '0', 'monitor:operlog:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 228 +insert into sys_menu values('1040', '操作查询', '500', '1', '#', '', 1, 'F', '0', '0', 'monitor:operlog:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  229 +insert into sys_menu values('1041', '操作删除', '500', '2', '#', '', 1, 'F', '0', '0', 'monitor:operlog:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  230 +insert into sys_menu values('1042', '日志导出', '500', '4', '#', '', 1, 'F', '0', '0', 'monitor:operlog:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
230 -- 登录日志按钮 231 -- 登录日志按钮
231 -insert into sys_menu values('1043', '登录查询', '501', '1', '#', '', 1, 'F', '0', 'monitor:logininfor:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
232 -insert into sys_menu values('1044', '登录删除', '501', '2', '#', '', 1, 'F', '0', 'monitor:logininfor:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
233 -insert into sys_menu values('1045', '日志导出', '501', '3', '#', '', 1, 'F', '0', 'monitor:logininfor:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 232 +insert into sys_menu values('1043', '登录查询', '501', '1', '#', '', 1, 'F', '0', '0', 'monitor:logininfor:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  233 +insert into sys_menu values('1044', '登录删除', '501', '2', '#', '', 1, 'F', '0', '0', 'monitor:logininfor:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  234 +insert into sys_menu values('1045', '日志导出', '501', '3', '#', '', 1, 'F', '0', '0', 'monitor:logininfor:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
234 -- 在线用户按钮 235 -- 在线用户按钮
235 -insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', 1, 'F', '0', 'monitor:online:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
236 -insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', 1, 'F', '0', 'monitor:online:batchLogout', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
237 -insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', 1, 'F', '0', 'monitor:online:forceLogout', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 236 +insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', 1, 'F', '0', '0', 'monitor:online:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  237 +insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', 1, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  238 +insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', 1, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
238 -- 定时任务按钮 239 -- 定时任务按钮
239 -insert into sys_menu values('1049', '任务查询', '110', '1', '#', '', 1, 'F', '0', 'monitor:job:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
240 -insert into sys_menu values('1050', '任务新增', '110', '2', '#', '', 1, 'F', '0', 'monitor:job:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
241 -insert into sys_menu values('1051', '任务修改', '110', '3', '#', '', 1, 'F', '0', 'monitor:job:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
242 -insert into sys_menu values('1052', '任务删除', '110', '4', '#', '', 1, 'F', '0', 'monitor:job:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
243 -insert into sys_menu values('1053', '状态修改', '110', '5', '#', '', 1, 'F', '0', 'monitor:job:changeStatus', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
244 -insert into sys_menu values('1054', '任务导出', '110', '7', '#', '', 1, 'F', '0', 'monitor:job:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 240 +insert into sys_menu values('1049', '任务查询', '110', '1', '#', '', 1, 'F', '0', '0', 'monitor:job:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  241 +insert into sys_menu values('1050', '任务新增', '110', '2', '#', '', 1, 'F', '0', '0', 'monitor:job:add', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  242 +insert into sys_menu values('1051', '任务修改', '110', '3', '#', '', 1, 'F', '0', '0', 'monitor:job:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  243 +insert into sys_menu values('1052', '任务删除', '110', '4', '#', '', 1, 'F', '0', '0', 'monitor:job:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  244 +insert into sys_menu values('1053', '状态修改', '110', '5', '#', '', 1, 'F', '0', '0', 'monitor:job:changeStatus', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  245 +insert into sys_menu values('1054', '任务导出', '110', '7', '#', '', 1, 'F', '0', '0', 'monitor:job:export', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
245 -- 代码生成按钮 246 -- 代码生成按钮
246 -insert into sys_menu values('1055', '生成查询', '114', '1', '#', '', 1, 'F', '0', 'tool:gen:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
247 -insert into sys_menu values('1056', '生成修改', '114', '2', '#', '', 1, 'F', '0', 'tool:gen:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
248 -insert into sys_menu values('1057', '生成删除', '114', '3', '#', '', 1, 'F', '0', 'tool:gen:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
249 -insert into sys_menu values('1058', '导入代码', '114', '2', '#', '', 1, 'F', '0', 'tool:gen:import', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
250 -insert into sys_menu values('1059', '预览代码', '114', '4', '#', '', 1, 'F', '0', 'tool:gen:preview', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');  
251 -insert into sys_menu values('1060', '生成代码', '114', '5', '#', '', 1, 'F', '0', 'tool:gen:code', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); 247 +insert into sys_menu values('1055', '生成查询', '114', '1', '#', '', 1, 'F', '0', '0', 'tool:gen:query', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  248 +insert into sys_menu values('1056', '生成修改', '114', '2', '#', '', 1, 'F', '0', '0', 'tool:gen:edit', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  249 +insert into sys_menu values('1057', '生成删除', '114', '3', '#', '', 1, 'F', '0', '0', 'tool:gen:remove', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  250 +insert into sys_menu values('1058', '导入代码', '114', '2', '#', '', 1, 'F', '0', '0', 'tool:gen:import', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  251 +insert into sys_menu values('1059', '预览代码', '114', '4', '#', '', 1, 'F', '0', '0', 'tool:gen:preview', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
  252 +insert into sys_menu values('1060', '生成代码', '114', '5', '#', '', 1, 'F', '0', '0', 'tool:gen:code', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '');
252 253
253 254
254 -- ---------------------------- 255 -- ----------------------------
@@ -44,9 +44,12 @@ public class SysMenu extends BaseEntity @@ -44,9 +44,12 @@ public class SysMenu extends BaseEntity
44 /** 类型（M目录 C菜单 F按钮） */ 44 /** 类型（M目录 C菜单 F按钮） */
45 private String menuType; 45 private String menuType;
46 46
47 - /** 菜单状态:0显示,1隐藏 */ 47 + /** 显示状态（0显示 1隐藏） */
48 private String visible; 48 private String visible;
49 49
  50 + /** 菜单状态（0显示 1隐藏） */
  51 + private String status;
  52 +
50 /** 权限字符串 */ 53 /** 权限字符串 */
51 private String perms; 54 private String perms;
52 55
@@ -162,6 +165,16 @@ public class SysMenu extends BaseEntity @@ -162,6 +165,16 @@ public class SysMenu extends BaseEntity
162 this.visible = visible; 165 this.visible = visible;
163 } 166 }
164 167
  168 + public String getStatus()
  169 + {
  170 + return status;
  171 + }
  172 +
  173 + public void setStatus(String status)
  174 + {
  175 + this.status = status;
  176 + }
  177 +
165 @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") 178 @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
166 public String getPerms() 179 public String getPerms()
167 { 180 {
@@ -205,6 +218,7 @@ public class SysMenu extends BaseEntity @@ -205,6 +218,7 @@ public class SysMenu extends BaseEntity
205 .append("isFrame", getIsFrame()) 218 .append("isFrame", getIsFrame())
206 .append("menuType", getMenuType()) 219 .append("menuType", getMenuType())
207 .append("visible", getVisible()) 220 .append("visible", getVisible())
  221 + .append("status ", getStatus())
208 .append("perms", getPerms()) 222 .append("perms", getPerms())
209 .append("icon", getIcon()) 223 .append("icon", getIcon())
210 .append("createBy", getCreateBy()) 224 .append("createBy", getCreateBy())
@@ -24,7 +24,7 @@ public class RouterVo @@ -24,7 +24,7 @@ public class RouterVo
24 /** 24 /**
25 * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现 25 * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
26 */ 26 */
27 - private String hidden; 27 + private boolean hidden;
28 28
29 /** 29 /**
30 * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 30 * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
@@ -71,12 +71,12 @@ public class RouterVo @@ -71,12 +71,12 @@ public class RouterVo
71 this.path = path; 71 this.path = path;
72 } 72 }
73 73
74 - public String getHidden() 74 + public boolean getHidden()
75 { 75 {
76 return hidden; 76 return hidden;
77 } 77 }
78 78
79 - public void setHidden(String hidden) 79 + public void setHidden(boolean hidden)
80 { 80 {
81 this.hidden = hidden; 81 this.hidden = hidden;
82 } 82 }
@@ -139,6 +139,7 @@ public class SysMenuServiceImpl implements ISysMenuService @@ -139,6 +139,7 @@ public class SysMenuServiceImpl implements ISysMenuService
139 for (SysMenu menu : menus) 139 for (SysMenu menu : menus)
140 { 140 {
141 RouterVo router = new RouterVo(); 141 RouterVo router = new RouterVo();
  142 + router.setHidden("1".equals(menu.getVisible()));
142 router.setName(StringUtils.capitalize(menu.getPath())); 143 router.setName(StringUtils.capitalize(menu.getPath()));
143 router.setPath(getRouterPath(menu)); 144 router.setPath(getRouterPath(menu));
144 router.setComponent(StringUtils.isEmpty(menu.getComponent()) ? "Layout" : menu.getComponent()); 145 router.setComponent(StringUtils.isEmpty(menu.getComponent()) ? "Layout" : menu.getComponent());
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 <result property="isFrame" column="is_frame" /> 15 <result property="isFrame" column="is_frame" />
16 <result property="menuType" column="menu_type" /> 16 <result property="menuType" column="menu_type" />
17 <result property="visible" column="visible" /> 17 <result property="visible" column="visible" />
  18 + <result property="status" column="status" />
18 <result property="perms" column="perms" /> 19 <result property="perms" column="perms" />
19 <result property="icon" column="icon" /> 20 <result property="icon" column="icon" />
20 <result property="createBy" column="create_by" /> 21 <result property="createBy" column="create_by" />
@@ -25,7 +26,7 @@ @@ -25,7 +26,7 @@
25 </resultMap> 26 </resultMap>
26 27
27 <sql id="selectMenuVo"> 28 <sql id="selectMenuVo">
28 - select menu_id, menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, ifnull(perms,'') as perms, icon, create_time 29 + select menu_id, menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
29 from sys_menu 30 from sys_menu
30 </sql> 31 </sql>
31 32
@@ -38,18 +39,21 @@ @@ -38,18 +39,21 @@
38 <if test="visible != null and visible != ''"> 39 <if test="visible != null and visible != ''">
39 AND visible = #{visible} 40 AND visible = #{visible}
40 </if> 41 </if>
  42 + <if test="status != null and status != ''">
  43 + AND status = #{status}
  44 + </if>
41 </where> 45 </where>
42 order by parent_id, order_num 46 order by parent_id, order_num
43 </select> 47 </select>
44 48
45 <select id="selectMenuTreeAll" resultMap="SysMenuResult"> 49 <select id="selectMenuTreeAll" resultMap="SysMenuResult">
46 - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.order_num, m.create_time  
47 - from sys_menu m where m.menu_type in ('M', 'C') and m.visible = 0 50 + select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.order_num, m.create_time
  51 + from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
48 order by m.parent_id, m.order_num 52 order by m.parent_id, m.order_num
49 </select> 53 </select>
50 54
51 <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult"> 55 <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
52 - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.order_num, m.create_time 56 + select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.order_num, m.create_time
53 from sys_menu m 57 from sys_menu m
54 left join sys_role_menu rm on m.menu_id = rm.menu_id 58 left join sys_role_menu rm on m.menu_id = rm.menu_id
55 left join sys_user_role ur on rm.role_id = ur.role_id 59 left join sys_user_role ur on rm.role_id = ur.role_id
@@ -61,17 +65,20 @@ @@ -61,17 +65,20 @@
61 <if test="visible != null and visible != ''"> 65 <if test="visible != null and visible != ''">
62 AND visible = #{visible} 66 AND visible = #{visible}
63 </if> 67 </if>
  68 + <if test="status != null and status != ''">
  69 + AND status = #{status}
  70 + </if>
64 order by m.parent_id, m.order_num 71 order by m.parent_id, m.order_num
65 </select> 72 </select>
66 73
67 <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult"> 74 <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
68 - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.order_num, m.create_time 75 + select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.order_num, m.create_time
69 from sys_menu m 76 from sys_menu m
70 left join sys_role_menu rm on m.menu_id = rm.menu_id 77 left join sys_role_menu rm on m.menu_id = rm.menu_id
71 left join sys_user_role ur on rm.role_id = ur.role_id 78 left join sys_user_role ur on rm.role_id = ur.role_id
72 left join sys_role ro on ur.role_id = ro.role_id 79 left join sys_role ro on ur.role_id = ro.role_id
73 left join sys_user u on ur.user_id = u.user_id 80 left join sys_user u on ur.user_id = u.user_id
74 - where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.visible = 0 AND ro.status = 0 81 + where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
75 order by m.parent_id, m.order_num 82 order by m.parent_id, m.order_num
76 </select> 83 </select>
77 84
@@ -97,7 +104,7 @@ @@ -97,7 +104,7 @@
97 left join sys_role_menu rm on m.menu_id = rm.menu_id 104 left join sys_role_menu rm on m.menu_id = rm.menu_id
98 left join sys_user_role ur on rm.role_id = ur.role_id 105 left join sys_user_role ur on rm.role_id = ur.role_id
99 left join sys_role r on r.role_id = ur.role_id 106 left join sys_role r on r.role_id = ur.role_id
100 - where m.visible = '0' and r.status = '0' and ur.user_id = #{userId} 107 + where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
101 </select> 108 </select>
102 109
103 <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult"> 110 <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
@@ -125,6 +132,7 @@ @@ -125,6 +132,7 @@
125 <if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if> 132 <if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
126 <if test="menuType != null and menuType != ''">menu_type = #{menuType},</if> 133 <if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
127 <if test="visible != null">visible = #{visible},</if> 134 <if test="visible != null">visible = #{visible},</if>
  135 + <if test="status != null">status = #{status},</if>
128 <if test="perms !=null">perms = #{perms},</if> 136 <if test="perms !=null">perms = #{perms},</if>
129 <if test="icon !=null and icon != ''">icon = #{icon},</if> 137 <if test="icon !=null and icon != ''">icon = #{icon},</if>
130 <if test="remark != null and remark != ''">remark = #{remark},</if> 138 <if test="remark != null and remark != ''">remark = #{remark},</if>
@@ -145,6 +153,7 @@ @@ -145,6 +153,7 @@
145 <if test="isFrame != null and isFrame != ''">is_frame,</if> 153 <if test="isFrame != null and isFrame != ''">is_frame,</if>
146 <if test="menuType != null and menuType != ''">menu_type,</if> 154 <if test="menuType != null and menuType != ''">menu_type,</if>
147 <if test="visible != null">visible,</if> 155 <if test="visible != null">visible,</if>
  156 + <if test="status != null">status,</if>
148 <if test="perms !=null and perms != ''">perms,</if> 157 <if test="perms !=null and perms != ''">perms,</if>
149 <if test="icon != null and icon != ''">icon,</if> 158 <if test="icon != null and icon != ''">icon,</if>
150 <if test="remark != null and remark != ''">remark,</if> 159 <if test="remark != null and remark != ''">remark,</if>
@@ -160,6 +169,7 @@ @@ -160,6 +169,7 @@
160 <if test="isFrame != null and isFrame != ''">#{isFrame},</if> 169 <if test="isFrame != null and isFrame != ''">#{isFrame},</if>
161 <if test="menuType != null and menuType != ''">#{menuType},</if> 170 <if test="menuType != null and menuType != ''">#{menuType},</if>
162 <if test="visible != null">#{visible},</if> 171 <if test="visible != null">#{visible},</if>
  172 + <if test="status != null">#{status},</if>
163 <if test="perms !=null and perms != ''">#{perms},</if> 173 <if test="perms !=null and perms != ''">#{perms},</if>
164 <if test="icon != null and icon != ''">#{icon},</if> 174 <if test="icon != null and icon != ''">#{icon},</if>
165 <if test="remark != null and remark != ''">#{remark},</if> 175 <if test="remark != null and remark != ''">#{remark},</if>
1 -- 菜单 SQL 1 -- 菜单 SQL
2 -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)  
3 -values('${functionName}', '3', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 'C', '0', '${permissionPrefix}:list', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '${functionName}菜单'); 2 +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
  3 +values('${functionName}', '3', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '${functionName}菜单');
4 4
5 -- 按钮父菜单ID 5 -- 按钮父菜单ID
6 SELECT @parentId := LAST_INSERT_ID(); 6 SELECT @parentId := LAST_INSERT_ID();
7 7
8 -- 按钮 SQL 8 -- 按钮 SQL
9 -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)  
10 -values('${functionName}查询', @parentId, '1', '#', '', 1, 'F', '0', '${permissionPrefix}:query', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); 9 +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
  10 +values('${functionName}查询', @parentId, '1', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
11 11
12 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) 12 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
13 -values('${functionName}新增', @parentId, '2', '#', '', 1, 'F', '0', '${permissionPrefix}:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); 13 +values('${functionName}新增', @parentId, '2', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
14 14
15 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) 15 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
16 -values('${functionName}修改', @parentId, '3', '#', '', 1, 'F', '0', '${permissionPrefix}:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); 16 +values('${functionName}修改', @parentId, '3', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
17 17
18 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) 18 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
19 -values('${functionName}删除', @parentId, '4', '#', '', 1, 'F', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); 19 +values('${functionName}删除', @parentId, '4', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
20 20
21 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) 21 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
22 -values('${functionName}导出', @parentId, '5', '#', '', 1, 'F', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');  
  22 +values('${functionName}导出', @parentId, '5', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');