|
@@ -2631,10 +2631,10 @@ class PublicController extends AbstractController
|
|
|
$validator = $this->validationFactory->make(
|
|
$validator = $this->validationFactory->make(
|
|
|
$requireData,
|
|
$requireData,
|
|
|
[
|
|
[
|
|
|
- 'pid' => 'required',
|
|
|
|
|
|
|
+ // 'pid' => 'required',
|
|
|
],
|
|
],
|
|
|
[
|
|
[
|
|
|
- 'pid.required' => 'id不能为空',
|
|
|
|
|
|
|
+ // 'pid.required' => 'id不能为空',
|
|
|
]
|
|
]
|
|
|
);
|
|
);
|
|
|
if ($validator->fails()) {
|
|
if ($validator->fails()) {
|
|
@@ -2643,7 +2643,8 @@ class PublicController extends AbstractController
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$result = $this->publicServiceClient->getLevel($requireData);
|
|
$result = $this->publicServiceClient->getLevel($requireData);
|
|
|
- return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
|
|
|
|
|
|
|
+ $result = PublicData::buildMenuTree($result['data']);
|
|
|
|
|
+ return $result ? Result::success($result) : Result::error('查询失败');
|
|
|
}
|
|
}
|
|
|
public function getLevelList()
|
|
public function getLevelList()
|
|
|
{
|
|
{
|