|
@@ -399,6 +399,7 @@ class Returngoods extends Start_Controller {
|
|
|
|
|
|
public function _data(){
|
|
|
$post = $this->input->post(NULL, TRUE);
|
|
|
+
|
|
|
if(isset($post['page']))
|
|
|
{
|
|
|
$page = $this->input->post('page',true);
|
|
@@ -429,6 +430,11 @@ class Returngoods extends Start_Controller {
|
|
|
if($shop)
|
|
|
{
|
|
|
$where .= " and shop = '$shop' ";
|
|
|
+ }else{
|
|
|
+ $this->getUserShop();
|
|
|
+ $shop_list = $this->data['shop_list'];
|
|
|
+ $shop_ids = array_keys($shop_list);
|
|
|
+ $where .= " and shop in (".implode(",",$shop_ids).")";
|
|
|
}
|
|
|
if( $status)
|
|
|
{
|