栏目列表

app/Controller/NewsController.php

@@ -45,35 +45,11 @@ class NewsController extends AbstractController
      */
     public function getCategoryList()
     {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'page'=> 'required',
-                'pageSize'=> 'required',
-            ],
-            [
-                'page.required' => '第几页不能为空',
-                'pageSize.required' => '每页显示条数不能为空',
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-         //获取用户信息
-        //  $user_id = Context::get("UserId");
-        //  $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
-        //  var_dump("用户信息：",$userInfo);
-        //  $sszq = $userInfo['data']['sszq'];
-        //  $type_id = $userInfo['data']['type_id']; //'1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员 20000：游客（小程序）'
-        $result = $this->newsServiceClient->getCategoryList($requireData);
-        if($result['data']){
-            foreach ($result['data']['rows'] as $k=>$v) {
-                $result['data']['rows'][$k]['pid_arr'] = $v['pid_arr']?json_decode($v['pid_arr']):[0];
-            }
+        $result = $this->newsServiceClient->getCategoryList([]);
+        if($result['code'] == 200){
+            return Result::success(PublicData::buildMenuTree($result['data']));
         }
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+        return  Result::error($result['message']);
     }
     /**
      * 站点下的导航池