Merge branch 'release/5.6' into release/security

@@ -321,11 +321,11 @@ const getShopList = params => {
             }
 
             // 店铺／品牌的小分类
-            _.forEach(value.sort, sortInfo => {
+            _.forEach(_.get(value, 'sortInfo.sort', []), sortInfo => {
                 _.forEach(_.get(sortInfo, 'sub', []), subSort => {
                     let sortHref;
 
-                    if (value.is_global === 'Y') {
+                    if (value.is_global !== 'Y') {
                         sortHref = helpers.urlFormat('', {misort: subSort.sort_id},
                             value.shop_domain || value.brand_domain);
                     } else {