diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index f3a81c7..e8f8924 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -71,13 +71,13 @@ public class StockService { return new ArrayList<>(); } //List shelves = streetService.check(street); - List stocks = stockMapper.selectList(new QueryWrapper().eq("street_id",streetId).orderByAsc("shelve_id", "`row`", "`column`")); + List stocks = stockMapper.selectList(new QueryWrapper().eq("street_id",streetId).orderByAsc("`direction`", "`side`", "`row`", "`column`")); return stocks; } public PageInfo page(PageSearch pageSearch) { PageHelper.startPage(pageSearch.getPageNum(), pageSearch.getPageSize()); - List stocks = stockMapper.selectList(new QueryWrapper().orderByAsc("shelve_id", "`row`", "`column`")); + List stocks = stockMapper.selectList(new QueryWrapper().orderByAsc("`direction`", "`side`","`row`", "`column`")); return new PageInfo<>(stocks); }