|
@@ -874,14 +874,14 @@ class Recruit extends Base
|
|
|
public function getFollowUpMessage()
|
|
|
{
|
|
|
$list = UserMessage::where(['m.user_id'=>$this->user_id,'m.is_deleted'=>0,'m.module'=>'recruit'])->where('m.type_id','in','4,5')->alias('m')
|
|
|
- ->field('m.id,m.create_at,m.is_read,m.children_id recruit_id,m.content')
|
|
|
+ ->field('m.id,m.create_at,m.is_read,m.children_id recruit_id,m.content,m.type_id')
|
|
|
->limit($this->off_set,$this->page_num)
|
|
|
->order(['m.id'=>'desc'])
|
|
|
->select()->toArray();
|
|
|
array_walk($list,function (&$v){
|
|
|
$v['is_normal'] = CheckPower::checkModulesPower($v['recruit_id'], 0, $this->request->controller());
|
|
|
});
|
|
|
- $total_num = UserMessage::where(['m.user_id'=>$this->user_id,'m.is_deleted'=>0,'m.module'=>'recruit','m.type_id'=>5])->alias('m')->count();
|
|
|
+ $total_num = UserMessage::where(['m.user_id'=>$this->user_id,'m.is_deleted'=>0,'m.module'=>'recruit'])->where('m.type_id','in','4,5')->alias('m')->count();
|
|
|
$this->success('ok',['list'=>$list,'total_count'=>$total_num,'page_num'=>$this->page_num]);
|
|
|
}
|
|
|
|