Merge remote-tracking branch 'remotes/origin/hotfix/urlSexChecked'

@@ -188,7 +188,7 @@ class ListProcess
             'dataType' => 'gender',
             'subs' => array(
                 array(
-                    'dataId' => empty($gender) ? '1,2,3' : $gender, // 产品非要这么做，我也没有办法
+                    'dataId' =>  '1,2,3',
                     'name' => '所有性别'
                 )
             )

@@ -339,6 +339,20 @@ class SearchController extends AbstractAction
 //            /* 精确搜索品类 */
 //            $data = Product\ListModel::getClassData($condition);
 
+            // 产品吴婷要求这么做，目的是保持性别中的所有性别和当前频道性别一致
+            if ($condition['gender'] === '1,2,3') {
+                switch ($condition['channel']) {
+                    case 1:
+                        $condition['gender'] = '1,3';
+                        break;
+                    case 2:
+                        $condition['gender'] = '2,3';
+                        break;
+                    default:
+                        break;
+                }
+            }
+
             $data = Product\SearchModel::getSearchData($condition, $showTag, $tagNew, $tagSale);
         } while (false);
 

@@ -151,6 +151,20 @@ class NewsaleController extends AbstractAction
             // 转换频道
             $channel = $this->get('channel') ? $this->get('channel') : Helpers::getChannelByCookie();
 
+            // 产品吴婷要求这么做，目的是保持性别中的所有性别和当前频道性别一致
+            if ($gender === '1,2,3') {
+                switch ($channel) {
+                    case 1:
+                        $gender = '1,3';
+                        break;
+                    case 2:
+                        $gender = '2,3';
+                        break;
+                    default:
+                        break;
+                }
+            }
+
             $data = NewsaleData::selectNewSaleProducts(
                 $gender, $brand, $sort, $color, $size, $price, $p_d, $channel, $dayLimit, $limit, $page, $order, null
             );