|
@@ -104,6 +104,7 @@ class Message extends Api
|
|
|
$list = Db::name('message')->where($wheres)->order('id')->select();
|
|
|
if($list){
|
|
|
foreach ($list as $k=>$v){
|
|
|
+ $data[$k]['message_id']=$v['id'];
|
|
|
$data[$k]['imgUrl']='';
|
|
|
$data[$k]['time']=$v['sendtime'];
|
|
|
$data[$k]['title']=$v['template_name'];
|
|
@@ -145,16 +146,24 @@ class Message extends Api
|
|
|
}
|
|
|
}else{
|
|
|
$user = User::getByUserId($post['user_id']);
|
|
|
- $wheres['group_id']=$user->group_id;
|
|
|
- $wheres['status']=2;
|
|
|
- $list = Db::name('message')->where($wheres)->order('id')->select();
|
|
|
+ $wheres['m.group_id']=$user->group_id;
|
|
|
+ $wheres['m.status']=2;
|
|
|
+ $user_id=$post['user_id'];
|
|
|
+ $list =Db::name('message')->alias('m')
|
|
|
+ ->field('m.id,mr.message_id')
|
|
|
+ ->join('message_read mr',"m.id =mr.message_id and mr.user_id='{$user_id}'",'left')
|
|
|
+ ->where($wheres)
|
|
|
+ ->select();
|
|
|
+
|
|
|
$res=array();
|
|
|
if($list){
|
|
|
foreach ($list as $k => $v){
|
|
|
- $arr['message_id'] = $v['id'];
|
|
|
- $arr['user_id'] = $post['user_id'];
|
|
|
- $arr['addtime']=time();
|
|
|
- $res[] = $arr;
|
|
|
+ if(empty($v['message_id'])){
|
|
|
+ $arr['message_id'] = $v['id'];
|
|
|
+ $arr['user_id'] = $post['user_id'];
|
|
|
+ $arr['addtime']=time();
|
|
|
+ $res[] = $arr;
|
|
|
+ }
|
|
|
};
|
|
|
$num = 100;//每次导入条数
|
|
|
$limit = ceil(count($res)/$num);
|