lvhao 1 неделя назад
Родитель
Сommit
9af8c78da0
1 измененных файлов с 11 добавлено и 2 удалено
  1. 11 2
      core/CoreApp/controllers/Returns.php

+ 11 - 2
core/CoreApp/controllers/Returns.php

@@ -143,10 +143,10 @@ class Returns extends Start_Controller {
             }
 			if($region == 0)
             {
-                $where  .= " and region = '$region'";
+                $where  .= " and region = '$region' ";
             }
 			if($region == 1){
-				$where  .= " and region = '$region'";
+				$where  .= " and region = '$region' ";
 			}
 			if($express)
             {
@@ -505,6 +505,7 @@ class Returns extends Start_Controller {
 			$orderinfo = $this->input->get('orderinfo',true);
 			$number = $this->input->get('number',true);
 			$torderinfo = $this->input->get('torderinfo',true);
+			$region = $this->input->get('region',true);
 			$timetk = strtotime($timetk);
 			$timetj = strtotime($timetj);
 			$dowid = $this->input->get('a');
@@ -528,6 +529,14 @@ class Returns extends Start_Controller {
             {
                 $where  .= " and shop = '$shop'";
             }
+
+			if($region == 0){
+				$where  .= " and region = '$region' ";
+			}
+			if($region == 1){
+				$where  .= " and region = '$region' ";
+			}
+
 			if($fh)
             {
 				if($fh == 1)