0221

app/admin/controller/Customer.php

@@ -90,15 +90,15 @@ class Customer extends BaseController
                 $where[]=['itemid','=',$pid];
             }
         }
-        $list = Db::name('customer_org1')->where($condition)->page($page,$size)->column("id,pid,name,level,depart_link,creater,addtime");
+        $list = Db::name('customer_org1')->where($condition)->page($page,$size)->column("id,pid,name,level,depart_link,creater,addtime,status");
         $var=[];
         foreach ($list as $item) {
             $iten=[];
             $iten['name']=$item['name'];
-            $iten['code']="";
-            $iten['id']=$item['id'];
+//            $iten['code']="";
+//            $iten['id']=$item['id'];
             $iten['creater']=$item['creater'];
-           // $iten['status']=$item['status'];
+            $iten['status']=$item['status'];
             $iten['addtime']=$item['addtime'];
             $iten['kh']=0;//组织架构
             $var[]=$iten;
@@ -107,7 +107,7 @@ class Customer extends BaseController
         foreach ($itm as $vat){
             $inm=[];
             $inm['name']=$vat['companyName'];
-            $inm['id']=$vat['id'];
+//            $inm['id']=$vat['id'];
 //            $inm['code']=$vat['companyNo'];
 //            $inm['companyName']=$vat['companyName'];
 //            $inm['invoice_bank']=$vat['invoice_bank'];

app/admin/controller/Platform.php

@@ -21,6 +21,10 @@ class Platform extends BaseController
             return error_show(1003,"参数platform_name不能为空");
 
         }
+        $platform_type = isset($this->post['platform_type']) && $this->post['platform_type'] !=="" ? intval($this->post['platform_type']):"";
+        if($platform_type==""){
+            return error_show(1002,"参数platform_type不能为空");
+        }
         $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
         if($token==''){
             return error_show(1005,"参数token不能为空");
@@ -36,6 +40,7 @@ class Platform extends BaseController
         $data=[
             "platform_code"=>$platform_code,
             "platform_name"=>$platform_name,
+            "platform_type"=>$platform_type,
             "createrid"=>$action_id,
             "creater"=>$action_name,
             "desc"=>$desc,
@@ -59,6 +64,10 @@ class Platform extends BaseController
         if($platform_name!=""){
             $where[]=['platform_name',"like","%$platform_name%"];
         }
+        $platform_type = isset($this->post['platform_type']) && $this->post['platform_type'] !=="" ? intval($this->post['platform_type']):"";
+        if($platform_type !=""){
+            $where[]=['platform_type',"=",$platform_type];
+        }
         $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"";
         if($status!=""){
             $where[]=['status',"=",$status];
@@ -92,6 +101,10 @@ class Platform extends BaseController
         if ($platform_name == "") {
             return error_show(1002, "参数platform_name不能为空");
         }
+        $platform_type = isset($this->post['platform_type']) && $this->post['platform_type'] !== "" ? intval($this->post['platform_type']) :"";
+        if($platform_type==""){
+            return error_show(1002,"参数platform_type不能为空");
+        }
         $token = isset($this->post['token']) && $this->post['token'] != '' ? trim($this->post['token']) : "";
         if ($token == '') {
             return error_show(1005, "参数token不能为空");
@@ -108,6 +121,7 @@ class Platform extends BaseController
             "id" => $id,
             "platform_code" => $platform_code,
             "platform_name" => $platform_name,
+            "platform_type" => $platform_type,
             "createrid" => $action_id,
             "creater" => $action_name,
             "desc" => $desc,