|
@@ -575,7 +575,7 @@ class GoodsService
|
|
|
$data = array_merge($data, $categorys);
|
|
$data = array_merge($data, $categorys);
|
|
|
} else if (!empty($categorySuperId)) {
|
|
} else if (!empty($categorySuperId)) {
|
|
|
$categorys = SysCategory::where('category_super_id', $categorySuperId)
|
|
$categorys = SysCategory::where('category_super_id', $categorySuperId)
|
|
|
- ->where('category_status', 'ACTIVED')
|
|
|
|
|
|
|
+ ->whereIn('category_status', ['ACTIVED','UNSHOW'])
|
|
|
->select('category_id as id', 'category_name as name', 'category_super_id as pid', 'category_super_path')
|
|
->select('category_id as id', 'category_name as name', 'category_super_id as pid', 'category_super_path')
|
|
|
->orderBy('category_sort', 'DESC')
|
|
->orderBy('category_sort', 'DESC')
|
|
|
->get()
|
|
->get()
|
|
@@ -588,7 +588,7 @@ class GoodsService
|
|
|
$category['category_super_path'] = '#' . $category['id'] . '#';
|
|
$category['category_super_path'] = '#' . $category['id'] . '#';
|
|
|
// }
|
|
// }
|
|
|
$subCategory = SysCategory::where('category_super_path', 'like', '%' . $category['category_super_path'] . '%')
|
|
$subCategory = SysCategory::where('category_super_path', 'like', '%' . $category['category_super_path'] . '%')
|
|
|
- ->where('category_status', 'ACTIVED')
|
|
|
|
|
|
|
+ ->whereIn('category_status', ['ACTIVED','UNSHOW'])
|
|
|
->select('category_id as id', 'category_name as name', 'category_super_id as pid', 'category_super_path')
|
|
->select('category_id as id', 'category_name as name', 'category_super_id as pid', 'category_super_path')
|
|
|
->orderBy('category_sort', 'DESC')
|
|
->orderBy('category_sort', 'DESC')
|
|
|
->get()
|
|
->get()
|
gorden