1421

app/admin/controller/Customer.php

@@ -50,17 +50,8 @@ class Customer extends BaseController
                 $where[]=['itemid','=',$pid];
             }
         }
-        $itm = Db::name('customer_info')->where($where)->select();
-        $var=[];
-        foreach ($itm as $vat){
-            $inm=[];
-            $inm['name']=$vat['companyName'];
-            $inm['id']=$vat['id'];
-            $inm['code']=$vat['companyNo'];
-            $inm['kh']=1;
-            $var[]=$inm;
-        }
         $list = Db::name('customer_org1')->where($condition)->page($page,$size)->column("id,pid,name,level,depart_link");
+        $var=[];
         foreach ($list as $item) {
             $iten=[];
             $iten['name']=$item['name'];
@@ -69,7 +60,15 @@ class Customer extends BaseController
             $iten['kh']=0;
             $var[]=$iten;
         }
-
+        $itm = Db::name('customer_info')->where($where)->select();
+        foreach ($itm as $vat){
+            $inm=[];
+            $inm['name']=$vat['companyName'];
+            $inm['id']=$vat['id'];
+            $inm['code']=$vat['companyNo'];
+            $inm['kh']=1;
+            $var[]=$inm;
+        }
         return app_show(0,"获取成功",$var);
     }
     /*新建*/