Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/abutment/controller/Consult.php

@@ -528,8 +528,9 @@ class Consult extends HomeBaseController
 //            if (empty($apply_id) || $apply_id['code'] != 0) {
 //                return json_show(1002, "申请人数据不存在");
 //            }
-            $rm = $this->request->user['uid'];
-            $where[] = ['cb.createrid', "=", $rm];
+            $where[] = ['cb.createrid', "=", $this->request->user['uid']];
+            $where[] = ['cb.supplierNo', "=", $this->request->user['supplierNo']];
+
         }
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["cb.createrid", 'in', get_company_item_user_by_name($company_name)];

app/abutment/controller/HomeBaseController.php

@@ -13,6 +13,6 @@ class HomeBaseController extends BaseController
     protected $middleware=[
         homeMiddleware::class
     ];
-    
+
 
 }