|
@@ -98,7 +98,11 @@ public class BrandServiceImpl implements BrandService {
|
|
|
}
|
|
|
queryWrapper.groupBy("b.id");
|
|
|
//这里投机取巧使用id来代替创建时间来做倒序,历史原因,原来的表没创建时间这个字段
|
|
|
- queryWrapper.orderByAsc("b.sort_order").orderByDesc("b.id");
|
|
|
+ if(StringUtils.isNotBlank(orderBy)){
|
|
|
+ queryWrapper.last("order by b."+ orderBy);
|
|
|
+ }else {
|
|
|
+ queryWrapper.orderByAsc("b.sort_order").orderByDesc("b.id");
|
|
|
+ }
|
|
|
IPage<BrandEntity> page = new Page<>(pageNum , pageSize);
|
|
|
IPage<BrandEntity> resultPage = new Page<>();
|
|
|
resultPage = brandDao.getBrandBindListWithPage(page , queryWrapper);
|