|
@@ -78,15 +78,7 @@ class Index extends BaseController
|
|
|
if ($end !== "") {
|
|
|
$where[] = ['b.addtime', "<", date('Y-m-d H:i:s', strtotime($end) + 24 * 3600)];
|
|
|
}
|
|
|
- $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] != "" ? trim($this->post['supplierNo']) : "";
|
|
|
- if ($supplierNo != "") {
|
|
|
- $gyscode = Db::name("supplier")->where(["code" => $supplierNo])->find();
|
|
|
- if (empty($gyscode)) {
|
|
|
- return json_show(1004, "未找到供应商信息");
|
|
|
- }
|
|
|
- $wsmcode = Db::name("brand_book")->where(["gyscode" => $supplierNo, "is_del" => 0])->column("brand_id");
|
|
|
- $where[] = ['b.id', "in", $wsmcode];
|
|
|
- }
|
|
|
+
|
|
|
$company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
|
|
|
if ($company_name !== "") $where[] = ["b.createrid", 'in', get_company_item_user_by_name($company_name)];
|
|
|
|