code

main_new_version.php

@@ -657,13 +657,13 @@ switch ($action) {
                 )
                 , rr as (
                         select lon as lng, lat as lat, 'Origin' as label, port_of_loading as infor, 1 as sort, null::timestamp without time zone as stime, 'pol'::text as ptype 
-                            from vessel.vt_unlocode, aa where (lat<=90 or lat>=-90) and (lon<=180 or lon>=-180) and lon is not null and lat is not null and uncode=fport_of_loading_un
+                            from vessel.vt_unlocode, aa where (lat<=90 and lat>=-90) and (lon<=180 and lon>=-180) and lon is not null and lat is not null and uncode=fport_of_loading_un
                         union all
                         select lon as lng, lat as lat, 'Destination' as label, port_of_discharge as infor, 2 as sort, null::timestamp without time zone as stime, 'pod'::text as ptype 
-                            from vessel.vt_unlocode, aa where (lat<=90 or lat>=-90) and (lon<=180 or lon>=-180) and lon is not null and lat is not null and uncode=mport_of_discharge_un
+                            from vessel.vt_unlocode, aa where (lat<=90 and lat>=-90) and (lon<=180 and lon>=-180) and lon is not null and lat is not null and uncode=mport_of_discharge_un
                         union all
                         select lon as lng, lat as lat,  'Transfer' as label, port_of_transshipment_name as infor, 3 as sort, null::timestamp without time zone as stime, 'poe'::text as ptype 
-                            from vessel.vt_unlocode, aa where (lat<=90 or lat>=-90) and (lon<=180 or lon>=-180) and lon is not null and lat is not null and uncode=port_of_transshipment_un
+                            from vessel.vt_unlocode, aa where (lat<=90 and lat>=-90) and (lon<=180 and lon>=-180) and lon is not null and lat is not null and uncode=port_of_transshipment_un
                     )
             select * from rr order by sort, stime";
         $rss = common::excuteListSql($sql);

utils/common.class.php

@@ -1411,7 +1411,7 @@ class common {
             left join LATERAL ( select lon as lng, lat as lat,
                 '' as label, '' as infor, 3 as sort,
                 null::timestamp without time zone as stime,''::text as ptype 
-            from vessel.vt_unlocode where (lat<=90 or lat>=-90) and (lon<=180 or lon>=-180) and lon is not null and lat is not null and uncode=aa.shippr_uncode ) dd on true";
+            from vessel.vt_unlocode where (lat<=90 and lat>=-90) and (lon<=180 and lon>=-180) and lon is not null and lat is not null and uncode=aa.shippr_uncode ) dd on true";
         //todo 这里预写个大概
         //common::getTopBarSQL($toporiginType,$_REQUEST["transportation"]);    
         $shippr_uncode_10 = common::excuteListSql($shippr_uncode_10_sql);
@@ -1424,7 +1424,7 @@ class common {
                         left join LATERAL ( select lon as lng, lat as lat,
                             '' as label, '' as infor, 3 as sort,
                             null::timestamp without time zone as stime,''::text as ptype 
-                        from vessel.vt_unlocode where (lat<=90 or lat>=-90) and (lon<=180 or lon>=-180) and lon is not null and lat is not null and uncode=aa.fport_of_loading_un ) dd on true";
+                        from vessel.vt_unlocode where (lat<=90 and lat>=-90) and (lon<=180 and lon>=-180) and lon is not null and lat is not null and uncode=aa.fport_of_loading_un ) dd on true";
             $shippr_uncode_10 = common::excuteListSql($shippr_uncode_10_sql);
         }
         //$toporiginType = "fport_of_loading_un";
@@ -1437,7 +1437,7 @@ class common {
         left join LATERAL ( select lon as lng, lat as lat,
             '' as label, '' as infor, 3 as sort,
             null::timestamp without time zone as stime,''::text as ptype 
-        from vessel.vt_unlocode where (lat<=90 or lat>=-90) and (lon<=180 or lon>=-180) and lon is not null and lat is not null and uncode=aa.consignee_uncode ) dd on true";
+        from vessel.vt_unlocode where (lat<=90 and lat>=-90) and (lon<=180 and lon>=-180) and lon is not null and lat is not null and uncode=aa.consignee_uncode ) dd on true";
 
         $consignee_uncode_10 = common::excuteListSql($consignee_uncode_10_sql);
         //如果值没有：客户地址-->站点地址-->Port地址（POL/POD） 
@@ -1448,7 +1448,7 @@ class common {
                 left join LATERAL ( select lon as lng, lat as lat,
                     '' as label, '' as infor, 3 as sort,
                     null::timestamp without time zone as stime,''::text as ptype 
-                from vessel.vt_unlocode where (lat<=90 or lat>=-90) and (lon<=180 or lon>=-180) and lon is not null and lat is not null and uncode=aa.mport_of_discharge_un ) dd on true";
+                from vessel.vt_unlocode where (lat<=90 and lat>=-90) and (lon<=180 and lon>=-180) and lon is not null and lat is not null and uncode=aa.mport_of_discharge_un ) dd on true";
             $consignee_uncode_10 = common::excuteListSql($consignee_uncode_10_sql);
         }