yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-12-01 06:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: #20220802 用户更新

Browse Source
This commit is contained in:
赵世界 2022-08-02 18:20:06 +08:00
parent ad4f38fcbe
commit e83421ea5b
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Role/RolesController.php
View File

@ -45,7 +45,7 @@ class RolesController extends Controller
$this->setAfterUpdate($role->name); $this->setAfterUpdate($role->name);
$this->addLog($role->id, 'add'); $this->addLog($role->id, 'add');
return response($this->res, $this->res['httpCode']); return new RolesResource($role);
} }
public function addPermissions($id, Request $request) public function addPermissions($id, Request $request)

46
app/Http/Controllers/User/UsersController.php
View File

@ -10,6 +10,7 @@ use Faker\Generator as Faker;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use App\Http\Resources\UsersResource; use App\Http\Resources\UsersResource;
use Illuminate\Validation\Rule;
class UsersController extends Controller class UsersController extends Controller
{ {
@ -24,7 +25,7 @@ class UsersController extends Controller
public function index() public function index()
{ {
$users = User::query()->where('id', '<>', 1)->paginate(); $users = User::query()->where('id', '<>', 1)->with('roles:id,name,guard_name')->paginate();
return UsersResource::collection($users); return UsersResource::collection($users);
} }
@ -32,7 +33,7 @@ class UsersController extends Controller
public function store(Request $request, Faker $faker) public function store(Request $request, Faker $faker)
{ {
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'name' => 'required|string|unique:users,name|max:255', 'name' => 'required|string|max:255|unique:users,name',
'password' => 'required|string|min:8|confirmed', 'password' => 'required|string|min:8|confirmed',
'email' => 'email', 'email' => 'email',
'role_name' => 'required|string|exists:roles,name' 'role_name' => 'required|string|exists:roles,name'
@ -57,16 +58,51 @@ class UsersController extends Controller
public function show($id) public function show($id)
{ {
return new UsersResource(User::query()->find($id)); return new UsersResource(User::query()->with('roles:id,name,guard_name')->find($id));
} }
public function update() public function update($id, Request $request)
{ {
$validator = Validator::make($request->all(), [
'name' => [
'required',
'string',
'max:255',
Rule::unique('users')->ignore($id),
],
// 'old_password' => 'sometimes|required|string|min:8',
'password' => 'sometimes|string|min:8|confirmed',
'email' => 'sometimes|email',
'role_name' => 'sometimes|required|string|exists:roles,name'
]);
if ($validator->fails()) {
$this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
return response($this->res, $this->res['httpCode']);
}
$user = User::query()->find($id);
$user->update($request->toArray());
if ($request->has('role_name')) {
$user->syncRoles($request->role_name);
}
return new UsersResource($user);
} }
public function destory() public function destory($id)
{ {
$user = User::query()->find($id);
try {
$user->delete();
$this->addLog($id, 'status');
} catch (\Exception $e) {
$this->res = [
'httpCode' => 500,
'errorCode' => 500416,
'errorMessage' => $e->getMessage(),
];
}
return response($this->res, $this->res['httpCode']);
} }
} }