|
@@ -28,7 +28,7 @@ class GoodsCategoryClass extends BaseClass
|
|
|
$query = GoodsCategory::find();
|
|
$query = GoodsCategory::find();
|
|
|
$query->where(['xhGoodsCategory.mainId' => $mainId]);
|
|
$query->where(['xhGoodsCategory.mainId' => $mainId]);
|
|
|
//早期前期写法没规范，cId catId categoryId都有可能，需要兼容
|
|
//早期前期写法没规范，cId catId categoryId都有可能，需要兼容
|
|
|
- if (!empty($askInfo['cId']) || !empty($askInfo['categoryId']) || !empty($askInfo['catId'])) {
|
|
|
|
|
|
|
+ if (!empty($askInfo['cId']) || !empty($askInfo['categoryId']) || !empty($askInfo['catId']) || !empty($askInfo['classId'])) {
|
|
|
$cId = $askInfo['cId'] ?? 0;
|
|
$cId = $askInfo['cId'] ?? 0;
|
|
|
if (empty($cId)) {
|
|
if (empty($cId)) {
|
|
|
$cId = $askInfo['categoryId'] ?? 0;
|
|
$cId = $askInfo['categoryId'] ?? 0;
|
|
@@ -36,6 +36,9 @@ class GoodsCategoryClass extends BaseClass
|
|
|
if (empty($cId)) {
|
|
if (empty($cId)) {
|
|
|
$cId = $askInfo['catId'] ?? 0;
|
|
$cId = $askInfo['catId'] ?? 0;
|
|
|
}
|
|
}
|
|
|
|
|
+ if (empty($cId)) {
|
|
|
|
|
+ $cId = $askInfo['classId'] ?? 0;
|
|
|
|
|
+ }
|
|
|
$query->andWhere(['xhGoodsCategory.cId' => $cId]);
|
|
$query->andWhere(['xhGoodsCategory.cId' => $cId]);
|
|
|
}
|
|
}
|
|
|
if (!empty($askInfo['searchText'])) {
|
|
if (!empty($askInfo['searchText'])) {
|
