diff --git a/cutejava-front/src/api/system/menu.js b/cutejava-front/src/api/system/menu.js
index 8a888e68..7de9fdae 100644
--- a/cutejava-front/src/api/system/menu.js
+++ b/cutejava-front/src/api/system/menu.js
@@ -34,6 +34,13 @@ export function listMenuByPid(pid) {
   })
 }
 
+export function listRoleMenuByPid(pid) {
+  return request({
+    url: 'api/menu/listRoleMenuByPid?pid=' + pid,
+    method: 'post'
+  })
+}
+
 export function searchMenu(params) {
   return request({
     url: 'api/menu/searchMenu',
diff --git a/cutejava-front/src/assets/styles/variables.scss b/cutejava-front/src/assets/styles/variables.scss
index 5eebff7b..66b3e056 100644
--- a/cutejava-front/src/assets/styles/variables.scss
+++ b/cutejava-front/src/assets/styles/variables.scss
@@ -1 +1 @@
-@import 'themes/dark/variables.cyberorange';
+@import 'themes/light/variables.cloudsky';
diff --git a/cutejava-front/src/views/system/role/index.vue b/cutejava-front/src/views/system/role/index.vue
index 5fcca48f..044b2c3c 100644
--- a/cutejava-front/src/views/system/role/index.vue
+++ b/cutejava-front/src/views/system/role/index.vue
@@ -68,7 +68,7 @@
     </el-dialog>
     <el-row :gutter="15">
       <!--角色管理-->
-      <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="17" style="margin-bottom: 10px">
+      <el-col span="18" style="margin-bottom: 10px">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <span class="role-span">角色列表</span>
@@ -113,7 +113,7 @@
         </el-card>
       </el-col>
       <!-- 菜单授权 -->
-      <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="7">
+      <el-col span="6">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <el-tooltip class="item" effect="dark" content="选择指定角色分配菜单" placement="top">
@@ -153,7 +153,7 @@
 <script>
 import crudRoles from '@/api/system/role'
 import { searchDept, searchDeptTree } from '@/api/system/dept'
-import { listChildMenuSetByMenuId, listMenuByPid } from '@/api/system/menu'
+import { listChildMenuSetByMenuId, listRoleMenuByPid } from '@/api/system/menu'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -197,7 +197,7 @@ export default {
   methods: {
     getMenuDatas(node, resolve) {
       setTimeout(() => {
-        listMenuByPid(node.data.id ? node.data.id : 0).then(res => {
+        listRoleMenuByPid(node.data.id ? node.data.id : 0).then(res => {
           resolve(res)
         })
       }, 100)
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
index 18bfd7ee..b0f02ee7 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
@@ -72,6 +72,14 @@ public class SystemMenuController {
     return ResponseEntity.ok(systemMenuTbs);
   }
 
+  @ApiOperation("返回全部的菜单")
+  @PostMapping(value = "/listRoleMenuByPid")
+  @PreAuthorize("@el.check('menu:list','roles:list')")
+  public ResponseEntity<List<SystemMenuTb>> listRoleMenuByPid(@RequestParam Long pid) {
+    List<SystemMenuTb> systemMenuTbs = systemMenuService.listMenuByPid(pid, true);
+    return ResponseEntity.ok(systemMenuTbs);
+  }
+
   @ApiOperation("根据菜单ID返回所有子节点ID, 包含自身ID")
   @PostMapping(value = "/listChildMenuSetByMenuId")
   @PreAuthorize("@el.check('menu:list','roles:list')")