修改查询

app/Http/Controllers/Common/CommonController.php

@@ -179,7 +179,10 @@ class CommonController extends BaseController
         }
         if($request->get('session_token')['admin_groupnew'] != 7) {//管理员默认展示全部平台
             $session = Request()->get('session_token');//用户信息
-            $brand = CommonService::arrayFilterFieldValue($brand,[['company_id'=>$session['company_id']]]);
+            $brand_id = Company::where('com_id',$session['company_id'])->value('com_brand');
+            // $brand = CommonService::arrayFilterFieldValue($brand,[['company_id'=>$session['company_id']]]);
+            
+            $brand = CommonService::arrayFilterFieldValue($brand,[['id'=>explode(',',$brand_id)]]);
         }
 	    if($brand){
 	    	return $this->success('操作成功', $brand);
@@ -268,7 +271,8 @@ class CommonController extends BaseController
         }
         $session = $request->get('session_token');
         if ($session['admin_groupnew'] != 7){//管理员可以看全部
-            $where['company_id_searchin'] = $session['com_parent_id'];
+            $brand_id = Company::where('com_id',$session['company_id'])->value('com_brand');
+            $where['gs_bid_searchin'] = $brand_id;
         }
         if ($request->filled('function')) {
             if ($request->input('function') == 'supplierPrice') {

app/Services/SupplierPriceService.php

@@ -103,7 +103,7 @@ class SupplierPriceService extends Service
         $list = $data['list'];
         //按钮-添加
         $all_button = BmmcService::wherebutton($token, $priID);
-        if (($request['type'] == 2 && $session['admin_groupnew'] == 7) || $request['type'] == 1) {
+        if (($request['type'] == 2 && $session['admin_groupnew'] == 7) || ($request['type'] == 1 && $session['admin_groupnew'] != 7)) {
             $addPt = BmmcService::getTopButton('addGhprice', '', $all_button);
         } else {
             $addPt = BmmcService::getTopButton('', '', $all_button);