Sfoglia il codice sorgente

详情whitelist转换为数组返回

kely 9 mesi fa
parent
commit
1ccb52809c

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

@@ -27,7 +27,7 @@ class AssetResource extends JsonResource
             'group_id' => $this->group_id ?? 0,
             'geo_address_code' => $this->geo_address_code,
             'acl' => $this->acl,
-            'whitelist' => $this->whitelist,
+            'whitelist' => make_array_list($this->whitelist??''),
             'latitude' => $this->latitude,
             'longitude' => $this->longitude,
             'parent_id' => $this->parent_id,

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

@@ -28,7 +28,7 @@ class ContainerDetailResource extends JsonResource
             "doc_type"  => $this->doc_type,
             "description"  => $content?->description ? (new \App\Services\File\ImageUrlService)->getImageUrl($content?->description) : "",
             "acl"  => $this->acl,
-            "whitelist"  => $this->whitelist,
+            "whitelist"  => make_array_list($this->whitelist??''),
             "version" => $this->version,
             "created_at"  => (string)$this->created_at,
             "created_by" => new UserProfileResource($this->createdBy),

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

@@ -20,7 +20,7 @@ class LibraryResource extends JsonResource
             'asset_id' => $this->asset_id,
             'project_id' => $this->project_id,
             'acl' => $this->acl,
-            'whitelist' => $this->whitelist,
+            'whitelist' =>  make_array_list($this->whitelist??''),
             'created_at' => (string)$this->created_at,
             'updated_at' => (string)$this->updated_at,
         ];

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

@@ -39,7 +39,7 @@ class ProjectDetailResource extends JsonResource
             'acl' => $this->acl,
             'assets' =>$assets,
             'plans' =>$plans,
-            //'whitelist' => $this->whitelist,
+            "whitelist"  => make_array_list($this->whitelist??''),
             'description' => $this->description?(new \App\Services\File\ImageUrlService)->getImageUrl($this->description):null,
             'requirement_total'=>$this->requirements->count(),
             'task_total'=>$this->tasks->count(),

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

@@ -37,7 +37,7 @@ class TaskDetailResource extends JsonResource
             "mailto"  => $this->mailto,
             "email_subject"  => $this->email_subject,
             "acl"  => $this->acl,
-            "whitelist"  => $this->whitelist,
+            "whitelist"  => make_array_list($this->whitelist??''),
             "closed_by" => new UserProfileResource($this->closedBy),
             "closed_at" => $this->closed_at,
             "canceled_by" => new UserProfileResource($this->canceledBy),

+ 18 - 0
app/helpers.php

@@ -54,7 +54,25 @@ if (!function_exists('throw_validation_if')) {
     }
 }
 
+if (!function_exists('make_array_list')) {
+    function make_array_list(string $value):array {
+        $array=[];
+        if($value==''){
+            return $array;
+        }
+        $array = explode(',', $value);
+
+        $array = array_filter($array, function($value) {
+            return $value !== '';
+        });
+
+        $array = array_map(function($value) {
+            return intval($value);
+        }, $array);
 
+        return($array);
+    }
+}