|
@@ -43,7 +43,8 @@ class openmeetClassAction extends openapiAction
|
|
|
|
|
|
if (count($meetData) == 0) {
|
|
|
$this->showreturn(
|
|
|
- ["meeting_list"=>[],
|
|
|
+ [
|
|
|
+ "meeting_list"=>[],
|
|
|
"basic_information"=>[
|
|
|
"meeting_room_name" => $rawData['room_name'],
|
|
|
"meeting_name" => '空闲中',
|
|
@@ -107,10 +108,14 @@ class openmeetClassAction extends openapiAction
|
|
|
"meeting_time" => date("H:i", strtotime($nowMeet['start_time'])).' ~ '.date("H:i", strtotime($nowMeet['end_time'])),
|
|
|
"meeting_moderator" => $nowMeet['compere'],
|
|
|
];
|
|
|
+ $data['participants'] = [];
|
|
|
+ $data['meetingTopic'] = [];
|
|
|
|
|
|
// 党委会议(需要加入议题)
|
|
|
if ($nowMeet['type'] == 2) {
|
|
|
+
|
|
|
$topics = $this->db->getall("select `id`, `topic_title`, `topic_attendee`, `topic_state`, `topic_info` from `[Q]meeting_topics` where mid = {$nowMeet['id']} order by sort");
|
|
|
+
|
|
|
// 会议议题处理
|
|
|
for ($i = 0; $i < count($topics); $i++) {
|
|
|
$info = $topics[$i];
|
|
@@ -130,12 +135,6 @@ class openmeetClassAction extends openapiAction
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (!isset($data['meetingTopic'])) {
|
|
|
- $data['meetingTopic'] = [];
|
|
|
- }
|
|
|
- if (!isset($data['participants'])) {
|
|
|
- $data['participants'] = [];
|
|
|
- }
|
|
|
|
|
|
} else {
|
|
|
// 普通会议,议题为空
|