code

service/multilingual.class.php

@@ -380,7 +380,8 @@ class multilingual{
         $pageData =  $this->_loadPageInfo($langIds);
         $result['pageData'] = $pageData;
 
-        $langData =  $this->_loadLangInfo($langIds,$pageIds);
+        //langIds传空，意思是查全部语言
+        $langData =  $this->_loadLangInfo(null,$pageIds);
         $result['langData'] = $langData;
         return $result;
     }
@@ -483,6 +484,11 @@ class multilingual{
             $page_id_sql = "AND k.page_id IN (" . implode(',', $pageIds) . ")";
         }
 
+        $lang_id_sql = "";
+        if(!empty($langIds)){
+            $lang_id_sql = "AND l.id IN (" . implode(',', $langIds) . ")";
+        }
+
         $langSql = "SELECT 
             l.lang_key, 
             COUNT(k.id) AS unverified_count
@@ -492,7 +498,7 @@ class multilingual{
             AND k.status = 0    
         WHERE 
             l.is_active = TRUE
-            AND l.id IN (" . implode(',', $langIds) . ")
+            $lang_id_sql
         GROUP BY 
             l.id, l.lang_key, l.lang_name;";
 

service/ocean_order.class.php

@@ -2651,8 +2651,8 @@ class ocean_order {
         //处理basicInfo信息数据 --改为前端一样 同步 KLN_ocean
         //$vessel = utils::outDisplayForMerge($ocean['f_vessel'],$ocean['m_vessel']);
         //$voyage = utils::outDisplayForMerge($ocean['f_voyage'],$ocean['m_voyage']);
-        $$vessel = utils::outDisplayForMerge($val['f_vessel'],$val['oo_vessel']);
-        $$voyage = utils::outDisplayForMerge($val['f_voyage'],$val['oo_voyage']);
+        $$vessel = utils::outDisplayForMerge($ocean['f_vessel'],$ocean['oo_vessel']);
+        $$voyage = utils::outDisplayForMerge($ocean['f_voyage'],$ocean['oo_voyage']);
 
         $basicInfo = array("MAWB/MBL No." =>$ocean['m_bol'],"HAWB/HBOL" => $ocean['h_bol'],"Carrier_Booking_No" =>$ocean['booking_no'],
             "PO_NO" =>$ocean['_po_no'],"Vessel/Airline" =>$vessel,"Voyage/Filght" =>$voyage,