|
@@ -222,7 +222,8 @@ class common {
|
|
|
if ($user["is_kerry_shipment"] == "t") {
|
|
if ($user["is_kerry_shipment"] == "t") {
|
|
|
$sqlWhere = " is_kerry_shipment is not null and is_kerry_shipment=true";
|
|
$sqlWhere = " is_kerry_shipment is not null and is_kerry_shipment=true";
|
|
|
} else if ($user["is_kerry_shipment"] == "f") {
|
|
} else if ($user["is_kerry_shipment"] == "f") {
|
|
|
- $sqlWhere = " (is_kerry_shipment is null or is_kerry_shipment=false)";
|
|
|
|
|
|
|
+ //$sqlWhere = " (is_kerry_shipment is null or is_kerry_shipment=false)";
|
|
|
|
|
+ $sqlWhere = " (COALESCE(is_kerry_shipment,false) = false)";
|
|
|
} else {
|
|
} else {
|
|
|
$sqlWhere = " 1=1";
|
|
$sqlWhere = " 1=1";
|
|
|
}
|
|
}
|
|
@@ -284,8 +285,10 @@ class common {
|
|
|
{
|
|
{
|
|
|
// $sqlWhere .= " and 1=1";
|
|
// $sqlWhere .= " and 1=1";
|
|
|
}
|
|
}
|
|
|
- else
|
|
|
|
|
- $sqlWhere .= " and (schem_not_display is null or schem_not_display=false)";
|
|
|
|
|
|
|
+ else{
|
|
|
|
|
+ //$sqlWhere .= " and (schem_not_display is null or schem_not_display=false)";
|
|
|
|
|
+ $sqlWhere .= " and (COALESCE(schem_not_display,false) = false)";
|
|
|
|
|
+ }
|
|
|
if (strtolower($type) == "ocean") {
|
|
if (strtolower($type) == "ocean") {
|
|
|
$sqlWhere .= " and ((order_from='public' ";
|
|
$sqlWhere .= " and ((order_from='public' ";
|
|
|
$sqlWhere .= self::_oceanHandNew($user, "public");
|
|
$sqlWhere .= self::_oceanHandNew($user, "public");
|