|
|
@@ -237,7 +237,12 @@ class History extends Common
|
|
|
}
|
|
|
|
|
|
$service_log = db('service_log')->where('servicelog_id',$servicelogId)->find();
|
|
|
- $account = db('accounts')->field('id,account_name,nick_name,account_email,account_phone,address,remark')->where('id',$service_log['user_id'])->find();
|
|
|
+ $account = db('accounts')
|
|
|
+ ->alias('a')
|
|
|
+ ->join('accountslabel b', 'a.label_id = b.id')
|
|
|
+ ->field('a.id,account_name,nick_name,account_email,account_phone,address,remark,name as label')
|
|
|
+ ->where('a.id',$service_log['user_id'])
|
|
|
+ ->find();
|
|
|
$account['user_ip'] = $service_log['user_ip'];
|
|
|
$account['system'] = $service_log['system'];
|
|
|
$account['browse'] = $service_log['browse'];
|