visuddhinanda 2 anni fa
parent
commit
29bf6535b5

+ 1 - 2
app/Http/Controllers/UserDictController.php

@@ -22,7 +22,7 @@ class UserDictController extends Controller
     {
         //
 		$result=false;
-		$indexCol = ['id','word','type','grammar','mean','parent','note','factors','confidence','updated_at','creator_id'];
+		$indexCol = ['id','word','type','grammar','mean','parent','note','factors','confidence','dict_id','updated_at','creator_id'];
 		switch ($request->get('view')) {
             case 'all':
             # 获取studio内所有channel
@@ -30,7 +30,6 @@ class UserDictController extends Controller
                 if(!$user){
                     return $this->error(__('auth.failed'));
                 }
-                array_push($indexCol,'dict_id');
                 $table = UserDict::select($indexCol);
                 break;
             case 'studio':

+ 4 - 0
app/Http/Resources/UserDictResource.php

@@ -5,6 +5,7 @@ namespace App\Http\Resources;
 use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Api\UserApi;
 use App\Models\UserOperationDaily;
+use App\Models\DictInfo;
 
 class UserDictResource extends JsonResource
 {
@@ -37,6 +38,9 @@ class UserDictResource extends JsonResource
                                                 ->sum('duration');
             $data['exp'] = (int)($exp/1000);
         }
+        if($request->get('view')==='all'){
+            $data['dict'] = DictInfo::where('id',$this->dict_id)->select(['id','name','shortname'])->first();
+        }
         return $data;
     }
 }