调整naming rule公共下拉列表

app/Http/Controllers/API/NameRuleController.php

@@ -32,9 +32,15 @@ class NameRuleController extends Controller
     //公共NameRule查询
     public function publicSearch(Request $request)
     {
-        $namingRules = NamingRule::allowed()->with(['company'])->filter($request->all())->get();
+        $namingRules = NamingRule::allowed()->where(function ($query) {
+            return $query->where("company_id", Auth::user()->company_id)->orWhere(function ($query){
+                $query->where('company_id',0)->where( 'global',1);
+            });
+        })->select(['id', 'name'])->get();
 
-        return NamingRuleSimpleResource::collection($namingRules);
+        return $this->success([
+            'data' => $namingRules
+        ]);
     }
 
     /**