Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-04-16 949e7e46086e034d747746d2b450d7c262c9a594

 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 {