commit

service/login.class.php

@@ -957,6 +957,7 @@ class login {
     public function passwordExpires($loginName,$email){
         $result = array(
             'msg' => "passwordExpires",
+            'uname' => $loginName,
         );
         common::echo_json_encode(400, $result);
         exit();

utils/common.class.php

@@ -1220,7 +1220,7 @@ class common {
             }
             if ($type == "co2e_destination"){
                 $co2e_consignee_union = utils::_getSql($station_str,$type,$shipment_mode);
-                if(!empty($co2e_shippr_sql_union)){
+                if(!empty($co2e_consignee_union)){
                     $co2e = common::excuteListSql($co2e_consignee_union);
                 }
             }
@@ -1229,7 +1229,6 @@ class common {
             $max = 0;
             $data = array();
             foreach($co2e as $val){
-                $ContainerCount_Title[] = $val['station'];
                 $data[] = $val['catnum'];
                 $total = $total + $val['catnum'];
                 $max = $max < $val['catnum'] ? $val['catnum'] : $max;

utils/utils.class.php

@@ -431,10 +431,10 @@ class utils {
         $ids_arr = explode(',', $ids);
         $sql = "";
         if($type == "co2e_orgin"){
-            $str = "SUM(COALESCE(carbon_emission,0)::numeric(12,10)) as catnum , shippr_uncode as station ";
+            $str = "SUM(COALESCE(carbon_emission,0)::numeric(12,10)) as catnum ";
             $filed = "shippr_uncode";
         } else {
-            $str = "SUM(COALESCE(carbon_emission,0)::numeric(12,10)) as catnum,consignee_uncode as station ";
+            $str = "SUM(COALESCE(carbon_emission,0)::numeric(12,10)) as catnum ";
             $filed = "consignee_uncode";
         }
 
@@ -446,7 +446,7 @@ class utils {
         foreach ($ids_arr as $value) {
             if (!empty($value)) {
                 if (empty($sql)) {
-                    $sql .= "SELECT $str FROM from online_ocean  where $shipment_mode_where and $filed = '$value'";
+                    $sql .= "SELECT $str FROM online_ocean  where $shipment_mode_where and $filed = '$value'";
                 } else {
                     $sql .= " union all SELECT $str from online_ocean  where $shipment_mode_where and $filed = '$value'";
                 }