|
...
|
...
|
@@ -33,7 +33,7 @@ class JoinModel extends Model |
|
|
|
|
|
|
|
public function getJoinData($activity_id){
|
|
|
|
$where['j.activity_id']=$activity_id;
|
|
|
|
$where['j.status']=1;
|
|
|
|
$where['j.status']=['in','1,3'];
|
|
|
|
$where['j.delete_time']=0;
|
|
|
|
$info=$this->alias('j')
|
|
|
|
->join('cmf_volunteer v','v.user_id=j.user_id')
|
...
|
...
|
|
