|
|
@@ -17,14 +17,13 @@ class GoodsCategoryService extends BaseService
|
|
|
public static function getGoodsList($where)
|
|
|
{
|
|
|
unset($where['delStatus']);//这个后面改进
|
|
|
- unset($where['inTurn']);//这个后面改进
|
|
|
$data = GoodsCategoryClass::getList('*', $where, 'status DESC,inTurn DESC');
|
|
|
$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
|
|
|
if (empty($list)) {
|
|
|
return $data;
|
|
|
}
|
|
|
$ids = array_column($list, 'gId');
|
|
|
- $list = GoodsService::getAllByCondition(['id' => ['in', $ids]], 'inTurn DESC', '*');
|
|
|
+ $list = GoodsService::getAllByCondition(['id' => ['in', $ids]], null, '*');
|
|
|
$data['list'] = GoodsClass::groupGoodsBaseInfo($list);
|
|
|
return $data;
|
|
|
}
|