lsm12139 hai 1 mes
pai
achega
d8b35a9237

+ 1 - 1
app/Http/Controllers/API/DepartmentController.php

@@ -74,7 +74,7 @@ class DepartmentController extends Controller
             ->where('company_id',$request->company_id)
             ->orderBy('created_at','desc')->get();
 
-        return ['data'=>UserProfileResource::collection($users)];
+        return ['data'=>UserSimpleResource::collection($users)];
     }
 
     public function store(CreateOrUpdateRequest $request)

+ 1 - 1
app/Http/Resources/API/UserInfoResource.php

@@ -32,7 +32,7 @@ class UserInfoResource extends JsonResource
             'menus' => $this->menus ?: [],
             'super_admin'=>Auth::user()->super_admin,
             'fs_password'=>$this->fs_password,
-            'leader_id' => $this->leader_id,
+            'leader_id' => new UserProfileResource($this->leaderId),
         ];
     }
 }

+ 1 - 0
app/Http/Resources/API/UserSimpleResource.php

@@ -31,6 +31,7 @@ class UserSimpleResource  extends JsonResource
             'role_name' => $this->role->name,
             'status' =>$this->status,
             'display_id' => $this->display_id,
+            'leader_id' => new UserProfileResource($this->leaderId),
         ];
     }
 }

+ 5 - 0
app/Models/User.php

@@ -120,4 +120,9 @@ class User extends Authenticatable
     {
         return $this->belongsTo(Department::class);
     }
+
+    public function leaderId(): \Illuminate\Database\Eloquent\Relations\BelongsTo
+    {
+        return $this->belongsTo(User::class, 'leader_id');
+    }
 }