Merge branch 'master-500-dev-xwx' into 'master-500-dev'

【禅道#762】菜单管理用户隐藏菜单，状态修改成功，菜单未隐藏



See merge request !607

@@ -784,7 +784,7 @@ layui.define(['table', 'form', 'laydate','treeTable', 'admin', 'layer', 'laytpl'
         function loadmenuTable(roleId,type) {
         function loadmenuTable(roleId,type) {
             loading = layer.load(2)
             loading = layer.load(2)
             // conditions.type = $('#condition-menu-name').val();
             // conditions.type = $('#condition-menu-name').val();
-            var url = domainName + '/api-user/menus/findMenus?type=noIndex&roleId='+roleId;  //如果不传type,表示为菜单授权
+            var url = domainName + '/api-user/menus/findMenus?type=noIndex&roleId='+roleId+'&hidden=1';  //如果不传type,表示为菜单授权
             if (type){  //如果传入type,表示为删除菜单，需要查询角色有权限的菜单,查询角色有权限菜单
             if (type){  //如果传入type,表示为删除菜单，需要查询角色有权限的菜单,查询角色有权限菜单
                 url = domainName + '/api-user/menus/'+roleId+'/getByRoleId';
                 url = domainName + '/api-user/menus/'+roleId+'/getByRoleId';
             }
             }
@@ -871,4 +871,4 @@ layui.define(['table', 'form', 'laydate','treeTable', 'admin', 'layer', 'laytpl'
         }
         }
 
 
     });
     });
-});
+});