visuddhinanda пре 2 година
родитељ
комит
ecd94b4819
1 измењених фајлова са 14 додато и 0 уклоњено
  1. 14 0
      app/Http/Controllers/UserDictController.php

+ 14 - 0
app/Http/Controllers/UserDictController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\UserDict;
+use App\Models\DictInfo;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Log;
@@ -10,6 +11,7 @@ use App\Http\Api;
 use App\Http\Api\AuthApi;
 use App\Http\Api\DictApi;
 use App\Http\Resources\UserDictResource;
+use Illuminate\Support\Str;
 
 class UserDictController extends Controller
 {
@@ -88,6 +90,18 @@ class UserDictController extends Controller
         if($request->has("search")){
             $table->where('word', 'like', $request->get("search")."%");
         }
+        if(($request->has('word'))){
+            $table = $table->where('word',$request->get('word'));
+        }
+        if(($request->has('parent'))){
+            $table = $table->where('parent',$request->get('parent'));
+        }
+        if(($request->has('dict'))){
+            $dictId = DictInfo::where('shortname',$request->get('dict'))->value('id');
+            if(Str::isUuid($dictId)){
+                $table = $table->where('dict_id',$dictId);
+            }
+        }
         $count = $table->count();
 
         $table->orderBy($request->get('order','updated_at'),