|
|
@@ -5075,9 +5075,10 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
$componentList[$key][$k] = $v ?? [];
|
|
|
if (isset($v['componentData']['level']) && (empty($v['componentData']['level']) || $v['componentData']['level'] == "")) {
|
|
|
$componentList[$key][$k]['componentData']['name'] = $all_cate[$cat_key]['alias'] ?? '';
|
|
|
- $category_arr = json_decode($all_cate[$cat_key]['real_category_arr_id'], true) ?? [];
|
|
|
- if(empty($category_arr)){
|
|
|
- $category_arr = json_decode($all_cate[$cat_key]['category_arr_id'], true) ?? [];
|
|
|
+ if(empty($all_cate[$cat_key]['real_category_arr_id'])){
|
|
|
+ $category_arr = json_decode($all_cate[$cat_key]['category_arr_id'] ?? [], true) ?? [];
|
|
|
+ }else{
|
|
|
+ $category_arr = json_decode($all_cate[$cat_key]['real_category_arr_id'] ?? [], true) ?? [];
|
|
|
}
|
|
|
$componentList[$key][$k]['componentData']['category_arr'] = $category_arr ?? [];
|
|
|
$componentList[$key][$k]['componentData']['category_id'] = $all_cate[$cat_key]['category_id'] ?? '';
|