code

service/ocean_order.class.php

@@ -1565,7 +1565,7 @@ class ocean_order {
         $air_milestone_status = common::excuteListSql("select code,
                 act_date,est_date,timezone 
             from  air_milestone a 
-		 		where a.serial_no='$serial_no' and code in('IFFCPU','IFFREC','IFFONB','IFFARR','IFFDEL')
+		 		where a.serial_no='$serial_no' and code in('IFFCPU','IFFREC','IFFONB','IFFARR','IFFDEL') and act_date is not null
             order by id");
         $state = -1;
         if (!empty($air_milestone_status)) {

service/report.class.php

@@ -1188,7 +1188,7 @@ class report {
                             $textSearch_arr = str_replace(",", ";", $textSearch_arr);
                             //$more_param = common::getInNotInSqlForSearch(strtolower($textSearch_arr));
                             //$temp_sql_where .= " and  lower(".$key.") in ($more_param)";
-                            $keywords = array_filter(array_map('trim', explode(';', strtolower($textSearch_arr))));
+                            $keywords = array_filter(array_map('trim', explode(';', $textSearch_arr)));
                             $likeConditions = [];
                             foreach ($keywords as $kw) {
                                 $kwLower = strtolower($kw);