|
|
@@ -25,9 +25,13 @@ class Express extends \app\BaseController
|
|
|
if($name!=''){
|
|
|
$where[]=["name|shortName","like","%{$name}%"];
|
|
|
}
|
|
|
+ $plat_type = isset($this->post['plat_type']) &&$this->post['plat_type'] !="" ? trim($this->post['plat_type']):'';
|
|
|
+ if($plat_type!=''){
|
|
|
+ $where[]=["plat_type","=",$plat_type];
|
|
|
+ }
|
|
|
$count = Db::name("express")->where($where)->count();
|
|
|
$page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
|
|
|
- $list= Db::name("express")->where($where)->field('id,type,comTypeName,name,shortName,shortNameEn,shortNumber,canOrder')
|
|
|
+ $list= Db::name("express")->where($where)->field('id,type,comTypeName,name,plat_type,shortName,shortNameEn,shortNumber,canOrder')
|
|
|
->page($page,$size)->select();
|
|
|
return app_show(0,'获取成功',['list'=>$list,"count"=>$count]);
|
|
|
}
|
|
|
@@ -53,7 +57,13 @@ class Express extends \app\BaseController
|
|
|
if($type===0){
|
|
|
$where[]=["type","=",$type];
|
|
|
}
|
|
|
+ $order_source = isset($this->post['order_source']) &&$this->post['order_source'] !=="" ? intval($this->post['order_source']):'1';
|
|
|
|
|
|
+ $plat_type=1;
|
|
|
+ if( $order_source==5){
|
|
|
+ $plat_type=2;
|
|
|
+ }
|
|
|
+ $where[]=["plat_type","=",$plat_type];
|
|
|
$name = isset($this->post['name']) &&$this->post['name'] !="" ? trim($this->post['name']):'';
|
|
|
if($name!=''){
|
|
|
$where[]=["name|shortName","like","%{$name}%"];
|
