|
|
@@ -45,12 +45,8 @@ class Kefu extends BaseController
|
|
|
->join('user', 'admin.id = user.uid', 'left')
|
|
|
->where('kefu_work.created_at', '>=', date('Y-m-d 00:00:00'));
|
|
|
|
|
|
- if (isset($params['is_online'])) {
|
|
|
- if ($params['is_online'] == 1) {
|
|
|
- $query->where('user.is_online', '>', 0);
|
|
|
- } else {
|
|
|
- $query->where('user.is_online', 0);
|
|
|
- }
|
|
|
+ if (isset($params['is_online']) && $params['is_online'] == '') {
|
|
|
+ $query->where('user.is_online', $params['is_online']);
|
|
|
}
|
|
|
|
|
|
$count = $query->count();
|
|
|
@@ -297,7 +293,7 @@ class Kefu extends BaseController
|
|
|
->where('admin.id','<>', $this->admin_id)
|
|
|
->order('admin.department_id', 'asc')
|
|
|
->order('user.is_online', 'desc')
|
|
|
- ->field(['user.user_id','user.account','user.realname','user.avatar','user.is_online','admin.nickname','admin.username'])
|
|
|
+ ->field(['admin.id','user.user_id','user.account','user.realname','user.avatar','user.is_online','admin.nickname','admin.username'])
|
|
|
->select()
|
|
|
->toArray();
|
|
|
return $this->success($list);
|