@@ -64,7 +64,7 @@ public function store(Store $request)
64
64
65
65
if ($ role ->save ()) {
66
66
67
- $ permissions = $ request ['permissions ' ];
67
+ $ permissions = $ request ['checkedPermissions ' ];
68
68
// 遍历选择的权限
69
69
foreach ($ permissions as $ permission ) {
70
70
$ p = Permission::where ('id ' , '= ' , $ permission )->firstOrFail ();
@@ -89,7 +89,8 @@ public function store(Store $request)
89
89
*/
90
90
public function show (Role $ role )
91
91
{
92
- return $ this ->out (200 , $ role );
92
+ $ permissions = Permission::all ();
93
+ return $ this ->out (200 , ['permissions ' => $ permissions , 'checkedPermissions ' => array_column ($ role ->permissions ->toArray (), 'id ' ), 'role ' => $ role ]);
93
94
}
94
95
95
96
/**
@@ -103,7 +104,7 @@ public function edit($id)
103
104
$ role = Role::findOrFail ($ id );
104
105
$ permissions = Permission::all ();
105
106
106
- return $ this ->out (200 , [$ role , $ permissions ]);
107
+ return $ this ->out (200 , [' permissions ' => $ permissions , ' role ' => $ role ]);
107
108
}
108
109
109
110
/**
@@ -114,17 +115,18 @@ public function edit($id)
114
115
* @param int $id
115
116
* @return \Illuminate\Http\Response
116
117
*/
117
- public function update (Update $ request, $ id )
118
+ public function update (Update $ request )
118
119
{
120
+ $ id = 3 ;
119
121
$ role = Role::findOrFail ($ id ); // 通过给定id获取角色
120
122
// 验证 name 和 permission 字段
121
123
$ this ->validate ($ request , [
122
124
'name ' => 'required|max:10|unique:roles,name, ' .$ id ,
123
125
'permissions ' => 'required ' ,
124
126
]);
125
127
126
- $ input = $ request ->except (['permissions ' ]);
127
- $ permissions = $ request ['permissions ' ];
128
+ $ input = $ request ->only (['name ' ]);
129
+ $ permissions = $ request ['checkedPermissions ' ];
128
130
if ($ role ->fill ($ input )->save ()) {
129
131
130
132
$ p_all = Permission::all ();//获取所有权限
0 commit comments