门店服务类目 信息

Signed-off-by: sunlei <sunlei@romens.cn>

backend/controllers/v1/branch/BranchController.php

@@ -245,7 +245,6 @@ class BranchController extends BaseController
      *   description="门店服务类目信息",
      *   summary="门店服务类目信息(孙磊)",
      *   operationId="Department",
-     *   @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
      *   @OA\Response(response="200",description="
      *           GUID:服务类目GUID,
      *           ORG_GUID:组织机构号,
@@ -261,8 +260,8 @@ class BranchController extends BaseController
     public function actionBranchServices()
     {
         $model=new BranchServiceType();
-        $info = $model->BranchServiceInfo('','');
-        if (!$info->getModels()) {
+        $info = $model->BranchServiceInfoAll();
+        if (!$info) {
             throw new BadRequestHttpException('未找到符合的门店服务类目信息');
         }
         return $info;

backend/models/v1/branch/BranchServiceType.php

@@ -85,6 +85,14 @@ class BranchServiceType extends BaseModel
             ]
         );
     }
+    //门店-门店服务类目信息 全部
+    public function BranchServiceInfoAll()
+    {
+        $query = static::find()->select('GUID,NAME,CODE,THEME_COLOR,DESCRIPTION,CREATE_TIME')
+                               ->all();
+        
+        return $query;
+    }
     //门店服务类目导出
     public function BranchServiceExport($params)
     {