|
@@ -120,13 +120,12 @@ class openmeetClassAction extends openapiAction
|
|
|
$data['meetingTopic'][$i]['tip'] = $info['topic_state'] == 1 ? "会议中" : "正常";
|
|
|
$data['meetingTopic'][$i]['text'] = $info['topic_title'];
|
|
|
if ($info['topic_state'] == 2) {
|
|
|
- $this_topics = [
|
|
|
+ $data['participants'][] = [
|
|
|
"topics" => $info['topic_title'],
|
|
|
"personnel_list" => $info['topic_info'],
|
|
|
];
|
|
|
-
|
|
|
if (isset($topics[$i + 1])) {
|
|
|
- $next_topics = [
|
|
|
+ $data['participants'][] = [
|
|
|
"topics" => $topics[$i + 1]['topic_title'],
|
|
|
"personnel_list" => $topics[$i + 1]['topic_info'],
|
|
|
];
|
|
@@ -134,9 +133,6 @@ class openmeetClassAction extends openapiAction
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $data['participants'][] = $this_topics;
|
|
|
- $data['participants'][] = $next_topics;
|
|
|
-
|
|
|
} else {
|
|
|
// 普通会议,议题为空
|
|
|
$data['meetingTopic'] = [];
|