root 1 рік тому
батько
коміт
5aec7e8258

+ 1 - 1
webmain/flow/input/mode_meetingAction.php

@@ -13,7 +13,7 @@ class mode_meetingClassAction extends inputAction{
 	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串,或者数组 rows 是可同时保存到数据库上数组
 	*/
 	protected function savebefore($table, $arr, $id, $addbo){
-        return m('meeting')->isapplymsg($arr['start_time'], $arr['end_time'], $arr['meeting_room'], $id, 1);
+        // return m('meeting')->isapplymsg($arr['start_time'], $arr['end_time'], $arr['meeting_room'], $id, 1);
 	}
 	
 	/**

+ 7 - 4
webmain/task/openapi/openmeetAction.php

@@ -213,7 +213,7 @@ class openmeetClassAction extends openapiAction
                     UNION ALL
                     SELECT 1 FROM `[Q]meeting_key`
                      WHERE `start_time` REGEXP '".$dataDate."'
-                       and `meet_state` == 1
+                       and `meet_state` = 1
                        and `room_id` = '".$data['id']."'
                 ) t";
             $meetingHave = $this->db->getall($sqlStr);
@@ -282,7 +282,7 @@ class openmeetClassAction extends openapiAction
                 and `end_time` > now()
                 and `room_id` = '".$roomId."'
              UNION ALL
-             SELECT 2 as type, id, title, start_time, end_time, compere, '党委会议' as meeting_type, tzone, meet_state
+             SELECT 2 as type, id, title, start_time, end_time, compere, '重要会议' as meeting_type, tzone, meet_state
                FROM `[Q]meeting_key`
               WHERE `start_time` regexp '".$dataDate."'
                 and `meet_state` != 2
@@ -443,7 +443,7 @@ class openmeetClassAction extends openapiAction
                     "meeting_state_text"=>m('meeting')->hyarra[$meetInfo['meet_state']],
                     "meeting_type"=>"重要会议"
                 ];
-
+                
                 if (!empty(trim($meetInfo['attendees']))) {
                     $info['basic_information']["meeting_attendees"][] = [
                         "label"=>"出席",
@@ -457,7 +457,10 @@ class openmeetClassAction extends openapiAction
                         "text"=>str_replace("\n", " ", $meetInfo['attends']),
                     ];
                 }
-
+                
+                if (!isset($info['basic_information']["meeting_attendees"])) {
+                    $info['basic_information']["meeting_attendees"] = [];
+                }
 
 
                 // 会议议题