|
@@ -387,8 +387,8 @@ class Colour extends Start_Controller {
|
|
|
$userwh = explode('|',trim($user['warehouse'],'|'));
|
|
$userwh = explode('|',trim($user['warehouse'],'|'));
|
|
|
foreach ($usersp as $value)
|
|
foreach ($usersp as $value)
|
|
|
{
|
|
{
|
|
|
- $fgshop .= " shop > 0 ";
|
|
|
|
|
- $sid .= " id > 0 ";
|
|
|
|
|
|
|
+ $fgshop .= " shop = ".$value." or";
|
|
|
|
|
+ $sid .= " id = ".$value." or";
|
|
|
}
|
|
}
|
|
|
foreach ($userwh as $value)
|
|
foreach ($userwh as $value)
|
|
|
{
|
|
{
|
|
@@ -508,7 +508,7 @@ class Colour extends Start_Controller {
|
|
|
$rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));
|
|
$rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));
|
|
|
echo json_encode($rows);exit;
|
|
echo json_encode($rows);exit;
|
|
|
}
|
|
}
|
|
|
- $wlshop = $this->shop->find_all('1=1 '.rtrim($sid,'or'));
|
|
|
|
|
|
|
+ $wlshop = $this->shop->find_all('1=1 and '.rtrim($sid,'or'));
|
|
|
$this->data['wlshop'] = $wlshop;
|
|
$this->data['wlshop'] = $wlshop;
|
|
|
$warehouse = $this->warehouse->find_all('1=1 and '.rtrim($wid,'or'),"*","px asc");
|
|
$warehouse = $this->warehouse->find_all('1=1 and '.rtrim($wid,'or'),"*","px asc");
|
|
|
$this->data['warehouse'] = $warehouse;
|
|
$this->data['warehouse'] = $warehouse;
|
