|
|
@@ -74,7 +74,7 @@ class UserController extends Controller
|
|
|
{
|
|
|
if(!Gate::allows('用户-录入')){ return redirect(url('/')); }
|
|
|
$roles=Role::all();
|
|
|
- $logistics=app('LogisticService')->getSelection(["id","name"],"物流");
|
|
|
+ $logistics=app('LogisticService')->getSelection(["id","name"],null);
|
|
|
$userWorkgroups=UserWorkgroup::query()->get();
|
|
|
$suppliers=Supplier::query()->get();
|
|
|
|
|
|
@@ -112,7 +112,7 @@ class UserController extends Controller
|
|
|
$user=$user->loadMissing('userDetail');
|
|
|
$rolesAll=Role::all();
|
|
|
$roles=$user->roles()->get();
|
|
|
- $logistics=app('LogisticService')->getSelection(["id","name"],"物流");
|
|
|
+ $logistics=app('LogisticService')->getSelection(["id","name"],null);
|
|
|
$logisticUser=$user->logistics()->get();
|
|
|
$userWorkgroups=UserWorkgroup::query()->get();
|
|
|
$userWorkgroup=$user->userWorkgroups()->first();
|