From 557d130af06da30bd1872f4252bbe151c162d11c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 16 Jan 2021 22:14:52 +0800
Subject: [PATCH] Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index bd84983..737b370 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -504,6 +504,9 @@
<if test="record.shopId != null">
and a.shop_id=#{record.shopId}
</if>
+ <if test="record.companyId != null">
+ and a.company_id=#{record.companyId}
+ </if>
</where>
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
order by a.order_time desc
@@ -530,6 +533,9 @@
<if test="record.shopId != null">
and a.shop_id=#{record.shopId}
</if>
+ <if test="record.companyId != null">
+ and a.company_id=#{record.companyId}
+ </if>
</where>
</select>
--
Gitblit v1.9.1