d

app/admin/controller/Supplier.php

@@ -32,10 +32,18 @@ class Supplier extends BaseController
        }
         $page =  isset($post['page'])&&$post['page']!="" ? intval($post['page']) :0;
         $size =  isset($post['size'])&&$post['size']!="" ? intval($post['size']) :10;
-        $count = Db::name("supplier_info")->where($condition)->count();
+        $count = Db::name("supplier_info")->alias("a")
+        ->leftJoin("company_info b","a.code=b.companyNo and b.is_del=0")
+        ->where($condition)->count();
         $total = ceil($count/$size)>1 ? ceil($count/$size) : 1;
         $page = $page>=$total?intval($total):$page;
-        $list =  Db::name("supplier_info")->where($condition)->page($page,$size)->field("id,code,name,contector,nature,type,mobile,address,post,addtime")->select();
+        $list =  Db::name("supplier_info")->alias("a")
+        ->leftJoin("company_info b","a.code=b.companyNo and b.is_del=0")
+        ->where($condition)
+        ->page($page,$size)
+        ->field("id,code,name,a.contector,nature,type,a.mobile,address,post,a.addtime,b.company_name,
+        company_address,company_license,bankNo,bank_name,b.contector as company_contector,b.mobile as company_mobile,
+        company_img")->select();
         return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }