wugg 1 年之前
父節點
當前提交
be3d993064
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      app/admin/controller/Check.php
  2. 2 2
      app/admin/controller/Purch.php

+ 1 - 1
app/admin/controller/Check.php

@@ -24,7 +24,7 @@ public function __construct(App $app)
     {
         $page = isset($this->post['page']) && $this->post['page'] !== "" ? intval($this->post['page']) : 1;
         $size = isset($this->post['size']) && $this->post['size'] !== "" ? intval($this->post['size']) : 10;
-        $condtion = [['b.is_del', "=", 0], ['c.is_del', "=", 0], ['b.is_stock', '=', 1]];
+        $condtion = [['b.is_del', "=", 0], ['c.is_del', "=", 0]];
         $wsmcode = isset($this->post['wsm_code']) && $this->post['wsm_code'] !== "" ? trim($this->post['wsm_code']) : "";
         if ($wsmcode !== "") {
             //return error_show(1002,"仓库code不能为空");

+ 2 - 2
app/admin/controller/Purch.php

@@ -1383,11 +1383,11 @@ class Purch extends Base
             ->select()
             ->toArray();
 
-        $all_createrid = array_column($list,'createrid');
+        $all_createrid =empty($list)?[]: array_column($list,'creater_id');
         $item = get_company_name_by_uid($all_createrid);
 
         foreach ($list as &$value){
-            $val['company_name']=$item[$value['createrid']]??'';
+            $val['company_name']=$item[$value['creater_id']]??'';
         }
 
         return app_show(0, '获取成功', ['list' => $list, 'count' => $count]);