lgy пре 1 дан
родитељ
комит
fac7744672

+ 1 - 1
server/application/api/model/report/ReportModel.php

@@ -764,7 +764,7 @@ class ReportModel extends ZskkDefaultModel {
 
     public function getVideo($id)
     {
-        $list = VideoModel::where('exam_id',$id)->select()->toArray();
+        $list = VideoModel::where('exam_id',$id)->select();
         return $list;
     }
 

+ 3 - 3
server/application/api/servies/report/ReportService.php

@@ -84,9 +84,9 @@ class ReportService extends ZskkDefaultService {
             $detail = $this->reportDao->getRemoteReportInfo($ra_id);
         }
         $institution = $this->reportDao->getInstitutionData(['id'=>$detail['institution_id']],['report_subtitle','report_title','hr_info']);
-        $detail['report_title'] = $institution['report_title'];
-        $detail['report_subtitle'] = $institution['report_subtitle'];
-        $detail['hr_info'] = $institution['hr_info'];
+        $detail['report_title'] = $institution['report_title'] ?? '';
+        $detail['report_subtitle'] = $institution['report_subtitle'] ?? '';
+        $detail['hr_info'] = $institution['hr_info'] ?? '';
         $time = date('Y-m-d H:i:s',time());
         //过期时间 大于当前  则 还没过期
         $where = "effective_date > '$time'";