|
|
@@ -63,11 +63,6 @@ class UserController extends Controller
|
|
|
return view('maintenance.user.index',compact('users','owners'));
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Show the form for creating a new resource.
|
|
|
- *
|
|
|
- * @return Response
|
|
|
- */
|
|
|
public function create()
|
|
|
{
|
|
|
if(!Gate::allows('用户-录入')){ return redirect(url('/')); }
|
|
|
@@ -98,12 +93,6 @@ class UserController extends Controller
|
|
|
]);
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Show the form for editing the specified resource.
|
|
|
- *
|
|
|
- * @param User $user
|
|
|
- * @return Response
|
|
|
- */
|
|
|
public function edit(User $user)
|
|
|
{
|
|
|
if(!Gate::allows('用户-编辑')){ return redirect(url('/')); }
|
|
|
@@ -131,13 +120,6 @@ class UserController extends Controller
|
|
|
return view('maintenance.user.edit',compact('user','rolesAll','roles','logistics','logisticUser','userWorkgroups','userWorkgroup','suppliers','supplierUser','workGroup','workGroups','ownerGroup','ownerGroups'));
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Update the specified resource in storage.
|
|
|
- *
|
|
|
- * @param Request $request
|
|
|
- * @param User $user
|
|
|
- * @return Response
|
|
|
- */
|
|
|
public function update(Request $request, User $user)
|
|
|
{
|
|
|
|
|
|
@@ -179,29 +161,28 @@ class UserController extends Controller
|
|
|
UserDetail::query()->where('user_id',$user->id) ->update(['mobile_phone'=>$phone]);
|
|
|
}
|
|
|
|
|
|
+ // 货主
|
|
|
+ $ownerIds = [];
|
|
|
//工作组
|
|
|
$work_id = [];
|
|
|
$treeData = $request->input('treeData')??[];
|
|
|
foreach ($treeData as $v){
|
|
|
if (strrpos($v,'g') === 0) array_push($work_id, mb_substr($v,1));
|
|
|
}
|
|
|
- if ($work_id)$user->workGroups()->sync($work_id);
|
|
|
+ if ($work_id){
|
|
|
+ $user->workGroups()->sync($work_id);
|
|
|
+ }
|
|
|
//项目组
|
|
|
$owners = $request->input('ownerGroup')??'';
|
|
|
- if ($owners)$user->ownerGroups()->sync($owners);
|
|
|
-
|
|
|
+ if ($owners){
|
|
|
+ $user->ownerGroups()->sync($owners);
|
|
|
+ }
|
|
|
+ app("UserService")->bindOwner($work_id, $owners, $user);
|
|
|
app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
|
|
|
app("UserService")->clearUserCache($user);
|
|
|
return redirect('maintenance/user/')->with('successTip',"成功修改用户“{$user['name']}”!");
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Remove the specified resource from storage.
|
|
|
- *
|
|
|
- * @param User $user
|
|
|
- * @return array|Response
|
|
|
- * @throws Exception
|
|
|
- */
|
|
|
public function destroy(User $user)
|
|
|
{
|
|
|
if(!Gate::allows('用户-删除')){ return redirect(url('/')); }
|