|
@@ -318,15 +318,15 @@ class WxApiAction extends Action {
|
|
|
|
|
|
foreach($list as &$val){
|
|
|
|
|
|
- $deivice_info=M('devices')->where(['bind_id' =>$val['id']])->find();
|
|
|
- if(!$deivice_info){
|
|
|
- $deivice_info=[
|
|
|
+ $device_info=M('devices')->where(['bind_id' =>$val['id']])->find();
|
|
|
+ if(!$device_info){
|
|
|
+ $device_info=[
|
|
|
'name'=>'-',
|
|
|
'imei'=>'-',
|
|
|
'loc_mode'=>'-',
|
|
|
];
|
|
|
}
|
|
|
- $val['deivice_info']=$deivice_info;
|
|
|
+ $val['device_info']=$device_info;
|
|
|
$val['department_name']=M('departments')->where(['id'=>$val['department_id']])->getField('department_name');
|
|
|
$val['creator']=M('users')->where(['id'=>$val['creator_id']])->getField('username');
|
|
|
|