Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

backend/controllers/v1/branch/BranchController.php

@@ -296,7 +296,10 @@ class BranchController extends BaseController
         if (!$info) {
             throw new BadRequestHttpException('未找到符合的门店服务类目信息');
         }
-        return $info;
+        return new ActiveDataProvider([
+            'models' => $info,
+            'pagination' => false
+        ]);
     }
     /**
      * @OA\Get(
@@ -318,7 +321,10 @@ class BranchController extends BaseController
         if (!$info) {
             throw new BadRequestHttpException('未找到符合的门店门店配送方式');
         }
-        return $info;
+        return new ActiveDataProvider([
+            'models' => $info,
+            'pagination' => false
+        ]);
     }
     /**
      * @OA\Get(
@@ -340,7 +346,10 @@ class BranchController extends BaseController
         if (!$info) {
             throw new BadRequestHttpException('未找到符合的分公司信息');
         }
-        return $info;
+        return new ActiveDataProvider([
+            'models' => $info,
+            'pagination' => false
+        ]);
     }
     /**
      * @OA\Get(
@@ -374,7 +383,10 @@ class BranchController extends BaseController
                 throw new BadRequestHttpException('未找到符合的门店区域信息');
             }
             $info[0]['ROLE_ID'] = $authRole;
-            return $info;
+            return new ActiveDataProvider([
+                'models' => $info,
+                'pagination' => false
+            ]);
         } else {
             //验证失败：$errors 是一个包含错误信息的数组
             Yii::$app->response->statusCode = 422;
@@ -413,7 +425,10 @@ class BranchController extends BaseController
                 throw new BadRequestHttpException('未找到符合的门店区域信息');
             }
             $info[0]['ROLE_ID'] = $authRole;
-            return $info;
+            return new ActiveDataProvider([
+                'models' => $info,
+                'pagination' => false
+            ]);
         } else {
             //验证失败：$errors 是一个包含错误信息的数组
             Yii::$app->response->statusCode = 422;

backend/models/v1/branch/ShopBranch.php

@@ -359,9 +359,7 @@ class ShopBranch extends BaseModel
 
         return new ActiveDataProvider([
             'query' => $query->asArray(),
-            'pagination' => [
-                'pageSize' => PAGE_SIZE
-            ],
+            'pagination' => false
         ]);
     }
     //获取门店(权限下的)