From acc6c0773bc959be6aa8cf6b9e767593a2d066f4 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 08 Mar 2021 11:20:39 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java
index 3769823..a3ad197 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java
@@ -3,6 +3,7 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
+import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.core.tools.excl.ExcelVersion;
@@ -48,6 +49,10 @@
@PostMapping(value = "/findOrderFlow")
public @ResponseBody
AjaxResult findOrderFlow(@RequestBody OrderFlowListDto orderFlowListDto) {
+ if(StringUtils.isBlank(orderFlowListDto.getSort())){
+ orderFlowListDto.setSort("createTime");
+ orderFlowListDto.setOrder("desc");
+ }
if (!DataAuthUtil.hasAllShopAuth()) {
QueryUtil.setQueryLimit(orderFlowListDto);
} else {
--
Gitblit v1.9.1