code

service/report.class.php

@@ -799,14 +799,7 @@ class report {
             $dataReturn['tableColumns'] =  $tableColumns;
             
             
-            //形成sql
-            $schedule_search = common::excuteObjectSql("select t.name,t.level,s.schedule_order_field,s.data_reference_field,s.data_range_type,
-                    s.dynamic_start_offset,s.dynamic_end_offset,
-                    s.fixed_start_date,s.fixed_end_date,
-                    t.report_sql,t.count_sql
-                from public.kln_report_template t 
-                     left join public.kln_report_schedule s on s.serial_no = t.serial_no  
-                where  s.serial_no = '$serial_no' and lower(s.create_by) = '".strtolower(_getLoginName())."'");
+            $schedule_search = common::excuteObjectSql("select t.name,t.level,t.report_sql,t.count_sql from public.kln_report_template t where  t.serial_no = '$serial_no'");
 
             $report_sql = $schedule_search["report_sql"];
             //$count_sql = $schedule_search["count_sql"];
@@ -833,6 +826,15 @@ class report {
                     $orderby = " order by \"".strtoupper($schedule_order_field)."\"";
                 }
             } else {
+                 //如果kln_report_schedule有值了。就直接这样查询  就页面而言不会进入这个分支
+                $schedule_search = common::excuteObjectSql("select t.name,t.level,s.schedule_order_field,s.data_reference_field,s.data_range_type,
+                        s.dynamic_start_offset,s.dynamic_end_offset,
+                        s.fixed_start_date,s.fixed_end_date,
+                        t.report_sql,t.count_sql
+                    from public.kln_report_template t 
+                        left join public.kln_report_schedule s on s.serial_no = t.serial_no  
+                    where  s.serial_no = '$serial_no' and lower(s.create_by) = '".strtolower(_getLoginName())."'");
+
                 if($schedule_search["data_range_type"] == "dynamic_rolling"){
                     $field_db = strtolower($schedule_search["data_reference_field"]);
                     $dynamic_start_offset_db = empty($schedule_search["dynamic_start_offset"]) ? 0 : $schedule_search["dynamic_start_offset"];