From 0605d6f275848001a0cf00b5f5d12ba40642ed28 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Tue, 27 Jul 2021 12:01:10 +0800
Subject: [PATCH] 1、guoliuangongneng
---
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