Ver código fonte

部门组织架构

lsm12139 3 meses atrás
pai
commit
93d11491c9
1 arquivos alterados com 3 adições e 3 exclusões
  1. 3 3
      app/Http/Controllers/API/DepartmentController.php

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

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\API\Department\CreateOrUpdateRequest;
 use App\Http\Resources\API\DepartmentResource;
 use App\Http\Resources\API\UserInfoResource;
+use App\Http\Resources\API\UserProfileResource;
 use App\Http\Resources\API\UserSimpleResource;
 use App\Models\Company;
 use App\Models\Department;
@@ -67,14 +68,13 @@ class DepartmentController extends Controller
     }
     public function userList(Request $request)
     {
-        $pageSize = $request->get('page_size') ?? 0;
         $users = User::query()
             ->filter($request->all())
             ->where('department_id', $request->department_id)
             ->where('company_id',$request->company_id)
-            ->orderBy('created_at','desc')->paginate($pageSize);;
+            ->orderBy('created_at','desc')->get();
 
-        return UserSimpleResource::collection($users);
+        return ['data'=>UserProfileResource::collection($users)];
     }
 
     public function store(CreateOrUpdateRequest $request)