|
@@ -7,6 +7,7 @@ use App\Http\Requests\API\Asset\CreateOrUpdateRequest;
|
|
|
use App\Http\Resources\API\AssetReportResource;
|
|
|
use App\Http\Resources\API\AssetResource;
|
|
|
use App\Models\Asset;
|
|
|
+use App\Models\File;
|
|
|
use App\Models\User;
|
|
|
use App\Services\File\ImageUrlService;
|
|
|
use Illuminate\Http\Request;
|
|
@@ -130,13 +131,28 @@ class AssetController extends Controller
|
|
|
|
|
|
public function tree()
|
|
|
{
|
|
|
- $assets = Asset::allowed()->get(['id', 'name', 'parent_id'])->each(function ($assets){
|
|
|
+ $assetsAttachmentArray = [];
|
|
|
+ $assets = Asset::allowed()->get(['id', 'name', 'parent_id'])->each(function ($assets) use(&$assetsAttachmentArray){
|
|
|
+
|
|
|
+
|
|
|
+ $asset =new Asset();
|
|
|
+ $asset ->parent_id = $assets->id;
|
|
|
+ $asset ->type = 'attachment';
|
|
|
+ $asset->uniId='attachment_'.$assets->id;
|
|
|
+ $asset->id = 123456789;
|
|
|
+ $assetsAttachmentArray[]=[
|
|
|
+ "parent_id"=>$assets->id,
|
|
|
+ "type"=>'attachment',
|
|
|
+ "name" => 'attachment',
|
|
|
+ "uniId"=>'attachment_'.$assets->id,
|
|
|
+ "id"=>rand(15,100)*rand(15,100)*rand(15,100),
|
|
|
+ ];
|
|
|
$assets->type='asset';
|
|
|
$assets->uniId=$assets->type.'_'.$assets->id;
|
|
|
});
|
|
|
|
|
|
return $this->success([
|
|
|
- 'data' => make_tree($assets->toArray())
|
|
|
+ 'data' => make_tree(array_merge($assets->toArray(),$assetsAttachmentArray))
|
|
|
]);
|
|
|
}
|
|
|
}
|