|
@@ -212,10 +212,8 @@ class openmeetClassAction extends openapiAction
|
|
|
and `room_id` = '".$data['id']."'
|
|
|
UNION ALL
|
|
|
SELECT 1 FROM `[Q]meeting_key`
|
|
|
- WHERE `start_time` < now()
|
|
|
- and `end_time` > now()
|
|
|
- and `start_time` REGEXP '".$dataDate."'
|
|
|
- and `meet_state` != 2
|
|
|
+ WHERE `start_time` REGEXP '".$dataDate."'
|
|
|
+ and `meet_state` == 1
|
|
|
and `room_id` = '".$data['id']."'
|
|
|
) t";
|
|
|
$meetingHave = $this->db->getall($sqlStr);
|
|
@@ -231,7 +229,6 @@ class openmeetClassAction extends openapiAction
|
|
|
UNION ALL
|
|
|
SELECT 1 FROM `[Q]meeting_key`
|
|
|
WHERE `start_time` REGEXP '".$dataDate."'
|
|
|
- AND `end_time` > now()
|
|
|
AND `meet_state` != 2
|
|
|
AND `room_id` = '".$data['id']."'
|
|
|
) t";
|