绑定货主

app/Http/Controllers/UserController.php

@@ -28,7 +28,7 @@ class UserController extends Controller
         if(!Gate::allows('用户-查询')){ return redirect(url('/'));  }
         $owners=app("OwnerService")->getIntersectPermitting();
         $userDetailQuery = UserDetail::query()->select('user_id')->where('type','临时工');
-        $query = User::with(['roles','logistics','userWorkgroups','suppliers','userDetail'])->whereNotIn('id',$userDetailQuery);
+        $query = User::with(['roles','logistics','workGroups','suppliers','userDetail'])->whereNotIn('id',$userDetailQuery);
         if($request->has('name')){
             $user=$request->input('name');
             $query->where('name','like',$user.'%');
@@ -161,8 +161,6 @@ class UserController extends Controller
             UserDetail::query()->where('user_id',$user->id) ->update(['mobile_phone'=>$phone]);
         }
 
-        // 货主
-        $ownerIds = [];
         //工作组
         $work_id = [];
         $treeData = $request->input('treeData')??[];

app/Services/UserService.php

@@ -217,12 +217,12 @@ class UserService
         if ($ownerGroupIds){
             $ownerIds = array_merge($ownerIds, app("OwnerService")->getOwnerGroupUnderOwner($ownerGroupIds));
         }
-        $user->loadMissing("owners:id");
+        /*$user->loadMissing("owners:id");
         if ($user->owners){
             foreach ($user->owners as $owner){
                 $ownerIds[] = $owner->id;
             }
-        }
+        }*/
         $ownerIds = array_unique($ownerIds);
         $user->owners()->sync($ownerIds);
     }

resources/views/maintenance/user/index.blade.php

@@ -22,7 +22,11 @@
                                     <li v-for="role in user.roles" style="list-style: none">@{{ role.name }}</li>
                                 </ul>
                             </td>
-                            <td><span v-if="user.workgroup&&user.workgroup.length>0">@{{ user.workgroup[0].name }}</span></td>
+                            <td><span v-if="user.work_groups && user.work_groups.length>0">
+                                    <p v-for="group in user.work_groups">
+                                        @{{ group.name }}
+                                    </p>
+                                </span></td>
                             <td>
                                 <ul v-if="user.logistics.length>0" class="list-group">
                                     <li v-for="logistic in user.logistics" style="list-style: none">@{{ logistic.name }}</li>