|
@@ -34,7 +34,7 @@ class Vehicle extends CatchController
|
|
|
$param=$request->param();
|
|
|
//联表条件o.rfid_id = s.id and o.owner_id = r.id
|
|
|
$cond=[
|
|
|
- '_string'=>'o.rfid_id = s.id',
|
|
|
+ '_string'=>'o.rfid_id = s.id and o.owner_id = r.id',
|
|
|
];
|
|
|
if($param['PLATE_NO']){
|
|
|
$cond['o.PLATE_NO']=['like',$param['PLATE_NO']];
|
|
@@ -49,8 +49,8 @@ class Vehicle extends CatchController
|
|
|
$cond['s.RFID_SN']=['like',$param['RFID_SN']];
|
|
|
}
|
|
|
|
|
|
- // $count=queryOracleCount('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_NON_MOTOR_OWNER r,DSSC3.W_DW_RFID_TAGS s',$cond);
|
|
|
- $count=queryOracleCount('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_RFID_TAGS s',$cond);
|
|
|
+ $count=queryOracleCount('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_NON_MOTOR_OWNER r,DSSC3.W_DW_RFID_TAGS s',$cond);
|
|
|
+ // $count=queryOracleCount('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_RFID_TAGS s',$cond);
|
|
|
// $count=100000;
|
|
|
$cond['page']=isset($param['page'])?$param['page']:1;
|
|
|
$cond['limit']=isset($param['limit'])?$param['limit']:10;
|