0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:角色选择数据权限报错

Browse Source
This commit is contained in:
JaguarJack 2024-02-21 16:33:22 +08:00
parent 604c17584f
commit 4606f9c792
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/Permissions/Http/Controllers/RolesController.php
View File

@ -6,6 +6,7 @@ namespace Modules\Permissions\Http\Controllers;
use Catch\Base\CatchController as Controller; use Catch\Base\CatchController as Controller;
use Catch\Exceptions\FailedException; use Catch\Exceptions\FailedException;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Modules\Permissions\Enums\DataRange; use Modules\Permissions\Enums\DataRange;
use Modules\Permissions\Models\Roles; use Modules\Permissions\Models\Roles;
@ -41,10 +42,14 @@ class RolesController extends Controller
public function store(RoleRequest $request) public function store(RoleRequest $request)
{ {
$data = $request->all(); $data = $request->all();
$data['data_range'] = (int) $data['data_range']; if (!isset($data['data_range'])) {
if (!$data['data_range'] || !DataRange::Personal_Choose->assert($data['data_range'])) { $data['data_range'] = 0;
} else {
$data['data_range'] = (int)$data['data_range'];
if (!DataRange::Personal_Choose->assert($data['data_range'])) {
$data['departments'] = []; $data['departments'] = [];
} }
}
return $this->model->storeBy($data); return $this->model->storeBy($data);
} }
@ -52,7 +57,8 @@ class RolesController extends Controller
/** /**
* *
* @param $id * @param $id
* @return \Illuminate\Database\Eloquent\Model|null * @param Request $request
* @return Model|null
*/ */
public function show($id, Request $request) public function show($id, Request $request)
{ {
@ -79,7 +85,7 @@ class RolesController extends Controller
{ {
$data = $request->all(); $data = $request->all();
$data['data_range'] = (int) $data['data_range']; $data['data_range'] = (int) $data['data_range'];
if (!$data['data_range'] || !DataRange::Personal_Choose->assert($data['data_range'])) { if (!DataRange::Personal_Choose->assert($data['data_range'])) {
$data['departments'] = []; $data['departments'] = [];
} }