Merge branch 'dev_wf' of wugg/cxinv into dev

app/admin/controller/Supplier.php

@@ -18,33 +18,38 @@ class Supplier extends BaseController
     {
         $post = $this->post;
         $condition = [];
-        $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
-       if($companyNo!=""){
-           $condition []=["code","=",$companyNo];
-       }
-       $name= isset($post['name'])&&$post['name']!="" ? trim($post['name']) :"";
-       if($name!=""){
-           $condition []=["name|a.contector","like","%{$name}%"];
-       }
-       $type=isset($post['type'])&&$post['type']!="" ? trim($post['type']) :"";
-        if($type!=""){
-           $condition []=["type","=",$type];
-       }
-        $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")->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")->alias("a")
-        ->leftJoin("company_info b","a.code=b.companyNo and b.is_del=0")
-        ->where($condition)
-        ->page($page,$size)->order("a.id desc")
-        ->field("a.*,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]);
+        $companyNo = isset($post['companyNo']) && $post['companyNo'] != "" ? trim($post['companyNo']) : "";
+        if ($companyNo != "")  $condition [] = ["code", "=", $companyNo];
+
+        $name = isset($post['name']) && $post['name'] != "" ? trim($post['name']) : "";
+        if ($name != "")   $condition [] = ["name|a.contector", "like", "%{$name}%"];
+
+        $type = isset($post['type']) && $post['type'] != "" ? trim($post['type']) : "";
+        if ($type != "")   $condition [] = ["type", "=", $type];
+
+        $supplierNo = isset($post['supplierNo']) && $post['supplierNo'] != "" ? trim($post['supplierNo']) : "";
+        if ($supplierNo != "")   $condition [] = ["a.code", "like", "%{$supplierNo}%"];
+
+        $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")
+            ->alias("a")
+            ->leftJoin("company_info b", "a.code=b.companyNo and b.is_del=0")
+            ->where($condition)
+            ->count('a.id');
+        $total = ceil($count / $size) > 1 ? ceil($count / $size) : 1;
+        $page = $page >= $total ? intval($total) : $page;
+        $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)
+            ->order("a.id desc")
+            ->field("a.*,b.company_name,company_address,company_license,bankNo,bank_name,b.contector as company_contector,b.mobile as company_mobile,company_img")
+            ->select()
+            ->toArray();
+        return app_show(0, "获取成功", ["list" => $list, "count" => $count]);
     }
 
     /**获取供应商列表

app/admin/controller/User.php

@@ -659,7 +659,7 @@ class User extends BaseController{
         ]);
         if ($validate->check($post) == false) return error_show(1004, $validate->getError());
 
-        $rs = add_supplier_acount($post);
+        $rs = add_supplier_account($post);
         if (!isset($rs['code']) || $rs['code'] != 0) return app_show(1004, $rs['message'],$rs['data']);
 
         $up = Db::name("user_role")->insert([

app/common.php

@@ -262,11 +262,11 @@ if(function_exists('add_admin_account') == false){
 }
 
 //添加供应商账号
-if(function_exists('add_supplier_acount') == false){
-    function add_supplier_acount(array $data=[]){
+if(function_exists('add_supplier_account') == false){
+    function add_supplier_account(array $data=[]){
         $host = Config::get("app");
 
-        $url = $host["api_host"]."/add_supplier_acount";
+        $url = $host["api_host"]."/add_supplier_account";
         $response=curl_request($url,$data);
 
         return json_decode($response,true);