合并分支 'workorder' 到 'master'

ok



查看合并请求 !2168

@@ -73,17 +73,11 @@ class AsideTicketController extends BaseController
 
 
     public function getProjects($search)
     public function getProjects($search)
     {
     {
-        $projects = TicketProject::with([
-            'projectV6:id,company,title',
-        ])
-            ->where('is_del', 0)
+        $projects = TicketProject::where('is_del', 0)
             ->where(function ($query) use ($search) {
             ->where(function ($query) use ($search) {
+                // 查找项目名称或公司名称
                 $query->where('title', 'like', '%' . $search . '%')
                 $query->where('title', 'like', '%' . $search . '%')
-                    ->orWhere('company_name', 'like', '%' . $search . '%')
-                    ->orWhereHas('projectV6', function ($q) use ($search) {
-                        $q->where('company', 'like', '%' . $search . '%')
-                          ->orWhere('title', 'like', '%' . $search . '%');
-                    });
+                    ->orWhere('company_name', 'like', '%' . $search . '%');
             })
             })
             ->get();
             ->get();
         $this->response('success', Code::SUCCESS, $projects);
         $this->response('success', Code::SUCCESS, $projects);