需求组返回资产信息

app/Http/Controllers/API/RequirementGroupController.php

@@ -18,7 +18,7 @@ class RequirementGroupController extends Controller
     public function index(Request $request)
     {
         $pageSize=$request->get('page_size') ?? 10;
-        $groups = RequirementGroup::filter($request->all())->where("parent_id",0)->with(['children'])->paginate($pageSize);
+        $groups = RequirementGroup::filter($request->all())->where("parent_id",0)->with(['children','asset'])->paginate($pageSize);
 
         return RequirementGroupResource::collection($groups);
     }

app/Http/Controllers/API/UserController.php

@@ -77,13 +77,13 @@ class UserController extends Controller
         $sort=$request->input('sort','desc');
         //超管能看到所有用户
         if(Auth::user()->super_admin){
-            $user = User::query()->filter($request->all())->orderBy('created_at',$sort)->paginate($pageSize);
+            $user = User::query()->filter($request->all())->with(['department'])->orderBy('created_at',$sort)->paginate($pageSize);
             return UserSimpleResource::collection($user);
         }
         //普通管理员能看到自己公司的用户
         $user=User::query()
             ->where('company_id',Auth::user()->company_id)
-            ->filter($request->all())->orderBy('created_at',$sort)->paginate($pageSize);
+            ->filter($request->all())->with(['department'])->orderBy('created_at',$sort)->paginate($pageSize);
         return UserSimpleResource::collection($user);
     }
 

app/Http/Resources/API/RequirementGroupResource.php

@@ -20,6 +20,7 @@ class RequirementGroupResource extends JsonResource
             'id'=>$this->id,
             'name'=>$this->name,
             'asset_id'=>$this->asset_id,
+            'asset'=>new SimpleAssetResource($this->asset),
             'abbr_name'=>$this->abbr_name,
             'parent_id' => $this->parent_id,
             //'children' =>$this->parent_id == 0 ? RequirementGroupResource::collection($this->children) : [],

app/Models/RequirementGroup.php

@@ -35,4 +35,9 @@ class RequirementGroup extends Model
     public function requirement(){
         return $this->hasMany(Requirement::class,'requirement_group_id');
     }
+
+    public function asset()
+    {
+        return $this->belongsTo(Asset::class, 'asset_id');
+    }
 }