|
|
@@ -24,12 +24,20 @@ class Message extends Base
|
|
|
$message = db('accountsmessage')->whereBetween('add_time', [$start, $end])->limit($offset, $limit)->order('add_time', 'desc')->select();
|
|
|
$total = db('accountsmessage')->whereBetween('add_time', [$start, $end])->order('add_time', 'desc')->count();
|
|
|
$pages = ceil($total/$limit);
|
|
|
+
|
|
|
+ $users = db('users')->select();
|
|
|
foreach($message as $key=>$vo){
|
|
|
//转为日期时间格式
|
|
|
$message[$key]['add_time'] = date('Y-m-d H:i:s',$vo['add_time']);
|
|
|
if(!empty($vo['dealWith_time'])){
|
|
|
$message[$key]['dealWith_time'] = date('Y-m-d H:i:s',$vo['dealWith_time']);
|
|
|
}
|
|
|
+ $message[$key]['user_name'] = '';
|
|
|
+ foreach($users as $k=>$v){
|
|
|
+ if($vo['user_id'] == $v['id']){
|
|
|
+ $message[$key]['user_name'] = $users[$k]['user_name'];
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
$info = array();
|
|
|
$info['total'] = $total;
|