*

@@ -5,9 +5,6 @@ namespace App\Http\Controllers\Release;
 use App\Helper\CacheKeyTools;
 use App\Helper\Response;
 use App\Http\Controllers\Controller;
-use GuzzleHttp\Client;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Log;
 
 
 class BaseController extends Controller

@@ -64,11 +64,17 @@ class IssueService extends Service
      */
     public function subCompany()
     {
+        $filter = ['HNBX', 'HNHZGJ', 'WHCE'];
+
         $company_ids = Stakeholder::query()->whereIn('id', $this->request->get('stakeholder_ids'))->pluck('company_id')->toArray();
         $subject = Subject::query()->whereIn('company_id', $company_ids)
-            ->where('attr', 'like', "%3%")
-            ->groupBy('no')
-            ->get(['no as value', 'name']);
+                                ->where('brand_id', '>', 0)
+                                ->get(['no as value', 'name', 'company_id'])->filter(function ($item) use ($filter) {
+                                    if ($item->company_id != 1) {
+                                        return true;
+                                    }
+                                    return !in_array($item->value, $filter);
+                                });
 
         return Response::success($subject);
     }