q 1 год назад
Родитель
Сommit
3a187aad97
1 измененных файлов с 7 добавлено и 3 удалено
  1. 7 3
      webmain/model/meetingModel.php

+ 7 - 3
webmain/model/meetingModel.php

@@ -40,9 +40,13 @@ class meetingClassModel extends Model
     public function isapplymsg($startdt, $enddt, $hyname, $id=0)
     {
         $msg 		= '';
-        $sql        = `select id, meeting_room, start_time, end_time from xinhu_meeting  where id <> {$id} and meet_state in (0, 1)
-                       union ALL
-                       select id, meeting_room, start_time, end_time from xinhu_meeting_key where id <> {$id} and meet_state in (0, 1)`;
+        $sql        =  /** @lang text */
+            'select id, meeting_room, start_time, end_time 
+               from xinhu_meeting  where id <> {$id} and meet_state in (0, 1)
+             union all
+             select id, meeting_room, start_time, end_time 
+               from xinhu_meeting_key where id <> {$id} and meet_state in (0, 1)';
+
         $rows 		= $this->db->getall($sql);
 
         foreach($rows as $k=>$rs){