|
@@ -37,8 +37,8 @@ class openmeetClassAction extends openapiAction
|
|
|
$this->showreturn(
|
|
|
["meeting_list"=>[],
|
|
|
"basic_information"=>[
|
|
|
- "meeting_room_name" => "空闲中",
|
|
|
- "meeting_name" => null,
|
|
|
+ "meeting_room_name" => $rawData['room_name'],
|
|
|
+ "meeting_name" => '空闲中',
|
|
|
"meeting_time" => null,
|
|
|
"meeting_moderator" => null,
|
|
|
],
|
|
@@ -100,6 +100,7 @@ class openmeetClassAction extends openapiAction
|
|
|
"meeting_moderator" => $nowMeet['compere'],
|
|
|
];
|
|
|
|
|
|
+ // 党委会议(需要加入议题)
|
|
|
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");
|
|
|
$this_topics = [];
|
|
@@ -123,27 +124,26 @@ class openmeetClassAction extends openapiAction
|
|
|
];
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
$data['participants'][] = $this_topics;
|
|
|
$data['participants'][] = $next_topics;
|
|
|
|
|
|
} else {
|
|
|
- $data['$basic_information'] = [
|
|
|
- "meeting_room_name" => "空闲中",
|
|
|
- "meeting_name" => null,
|
|
|
- "meeting_time" => null,
|
|
|
- "meeting_moderator" => null,
|
|
|
- ];
|
|
|
+ // 普通会议,议题为空
|
|
|
$data['meetingTopic'] = [];
|
|
|
$data['participants'] = [];
|
|
|
}
|
|
|
} else {
|
|
|
+ $data['$basic_information'] = [
|
|
|
+ "meeting_room_name" => $rawData['room_name'],
|
|
|
+ "meeting_name" => '空闲中',
|
|
|
+ "meeting_time" => null,
|
|
|
+ "meeting_moderator" => null,
|
|
|
+ ];
|
|
|
$data['meetingTopic'] = [];
|
|
|
$data['participants'] = [];
|
|
|
}
|
|
|
-
|
|
|
$this->showreturn($data, "请求成功");
|
|
|
}
|
|
|
|