From 40a2faaaa6cc0026cb7108f0b0e1b0f51f8b760c Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Tue, 06 Apr 2021 22:34:41 +0800 Subject: [PATCH] 用户积分定时失效 --- zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java index 26d1c64..f70a262 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java @@ -176,8 +176,11 @@ public @ResponseBody AjaxResult showList(ShoppingGoods shoppingGoods, PaginationVO pageVo) { QueryUtil.setQueryLimit(shoppingGoods); - pageVo.setOrder("desc"); - pageVo.setSort("createTime"); + if(StringUtils.isBlank(pageVo.getSort())){ + pageVo.setOrder("desc"); + pageVo.setSort("createTime"); + } + //2表示查询总部产品 if (shoppingGoods.getHeadquarters()!=null && 2==shoppingGoods.getHeadquarters()) { //仅查询本店产品 -- Gitblit v1.9.1