|
@@ -1709,6 +1709,7 @@ class Warehouse extends Start_Controller {
|
|
|
}
|
|
}
|
|
|
foreach ($userwh as $value)
|
|
foreach ($userwh as $value)
|
|
|
{
|
|
{
|
|
|
|
|
+ if($value === '' || $value === null) continue;
|
|
|
$wid .= " id = ".$value." or";
|
|
$wid .= " id = ".$value." or";
|
|
|
$wtype .= " type = ".$value." or";
|
|
$wtype .= " type = ".$value." or";
|
|
|
}
|
|
}
|
|
@@ -1918,6 +1919,7 @@ class Warehouse extends Start_Controller {
|
|
|
}
|
|
}
|
|
|
foreach ($userwh as $value)
|
|
foreach ($userwh as $value)
|
|
|
{
|
|
{
|
|
|
|
|
+ if($value === '' || $value === null) continue;
|
|
|
$wid .= " id = ".$value." or";
|
|
$wid .= " id = ".$value." or";
|
|
|
$wtype .= " type = ".$value." or";
|
|
$wtype .= " type = ".$value." or";
|
|
|
}
|
|
}
|
|
@@ -2172,7 +2174,7 @@ class Warehouse extends Start_Controller {
|
|
|
{
|
|
{
|
|
|
$where .= " and shop = '$shop'";
|
|
$where .= " and shop = '$shop'";
|
|
|
}
|
|
}
|
|
|
- if(!empty($type))
|
|
|
|
|
|
|
+ if($type)
|
|
|
{
|
|
{
|
|
|
$where .= " and type = '$type'";
|
|
$where .= " and type = '$type'";
|
|
|
}
|
|
}
|