|
@@ -130,7 +130,7 @@ class Activity extends Base
|
|
|
}
|
|
}
|
|
|
$status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"";
|
|
$status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"";
|
|
|
if($status!==""){
|
|
if($status!==""){
|
|
|
- $where[]=['a.status',"=",$status];
|
|
|
|
|
|
|
+ $where[]=['b.status',"=",$status];
|
|
|
}
|
|
}
|
|
|
$activity_name = isset($this->post['activity_name']) && $this->post['activity_name'] !=="" ? trim($this->post['activity_name']):"";
|
|
$activity_name = isset($this->post['activity_name']) && $this->post['activity_name'] !=="" ? trim($this->post['activity_name']):"";
|
|
|
if($activity_name!=""){
|
|
if($activity_name!=""){
|
