Merge branch 'feature/user0812' into develop
This commit is contained in:
@@ -64,7 +64,7 @@ class UserController extends BaseController
|
|||||||
public function edit(Request $request)
|
public function edit(Request $request)
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$data = $this->validate($this->service->getValidator(), $request->post(), 'update');
|
$data = $request->post();
|
||||||
$data['id'] = $data['id']??$request->user->uid;
|
$data['id'] = $data['id']??$request->user->uid;
|
||||||
$res = $this->service->serviceUpdate($request, $data);
|
$res = $this->service->serviceUpdate($request, $data);
|
||||||
return $this->success([], '更新成功');
|
return $this->success([], '更新成功');
|
||||||
|
|||||||
@@ -44,6 +44,8 @@ class UserService
|
|||||||
/** 更新 */
|
/** 更新 */
|
||||||
public function serviceUpdate(Request $request, array $data = [])
|
public function serviceUpdate(Request $request, array $data = [])
|
||||||
{
|
{
|
||||||
|
unset($data['roles']);
|
||||||
|
unset($data['corp_name']);
|
||||||
$data = $this->preProcess('Update', $data, $request);
|
$data = $this->preProcess('Update', $data, $request);
|
||||||
$config = $this->buildQueryConfig($request, 'edit');
|
$config = $this->buildQueryConfig($request, 'edit');
|
||||||
$updated = $this->logicUpdateBy($config, $data);
|
$updated = $this->logicUpdateBy($config, $data);
|
||||||
|
|||||||
Reference in New Issue
Block a user