|
@@ -23,17 +23,17 @@ class meetingClassModel extends Model
|
|
|
if ($meetType == 1) {
|
|
|
$sql = /** @lang text */
|
|
|
'select id, meeting_room, start_time, end_time, title
|
|
|
- from xinhu_meeting where id <> '.$id.' and meet_state in (0, 1)
|
|
|
+ from [Q]meeting where id <> '.$id.' and meet_state in (0, 1)
|
|
|
union all
|
|
|
select id, meeting_room, start_time, end_time, title
|
|
|
- from xinhu_meeting_key where meet_state in (0, 1)';
|
|
|
+ from [Q]meeting_key where meet_state in (0, 1)';
|
|
|
} else {
|
|
|
$sql = /** @lang text */
|
|
|
'select id, meeting_room, start_time, end_time, title
|
|
|
- from xinhu_meeting where meet_state in (0, 1)
|
|
|
+ from [Q]meeting where meet_state in (0, 1)
|
|
|
union all
|
|
|
select id, meeting_room, start_time, end_time, title
|
|
|
- from xinhu_meeting_key where id <> '.$id.' and meet_state in (0, 1)';
|
|
|
+ from [Q]meeting_key where id <> '.$id.' and meet_state in (0, 1)';
|
|
|
}
|
|
|
m('log')->addlog("验证", $sql);
|
|
|
|
|
@@ -79,6 +79,7 @@ class meetingClassModel extends Model
|
|
|
|
|
|
// 会议状态
|
|
|
public function meetingState($stime, $etime, $type=1) {
|
|
|
+ // type == 1 获取状态码, type==2获取状态名
|
|
|
$code = [0, 1, 2];
|
|
|
$info = m('meeting')->hyarra;
|
|
|
|