From 4f1a0c89b40a99e7e3b6ec72b42a1b9d6bac971a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Jan 2021 15:36:19 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
index aa826ad..5e75ca7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -1259,6 +1259,9 @@
 			<![CDATA[	and ( a.shop_id = #{record.shopId} or
 				      (  a.headquarters=1 and  ( ISNULL(a.use_shop) or LENGTH(trim(a.use_shop))<1 or FIND_IN_SET(#{record.shopId},a.use_shop))))]]>
 		</if>
+		<if test="record.companyId != null and record.companyId !='' ">
+			and a.company_id=#{record.companyId}
+		</if>
 		<if test="record.goodType!=null">
 			and a.good_type=#{record.goodType}
 		</if>
@@ -1286,6 +1289,9 @@
 			<![CDATA[	and ( a.shop_id = #{record.shopId} or
 				      (  a.headquarters=1 and  ( ISNULL(a.use_shop) or LENGTH(trim(a.use_shop))<1 or FIND_IN_SET(#{record.shopId},a.use_shop))))]]>
 		</if>
+		<if test="record.companyId != null and record.companyId !='' ">
+			and a.company_id=#{record.companyId}
+		</if>
 		<if test="record.goodType!=null">
 			and a.good_type=#{record.goodType}
 		</if>

--
Gitblit v1.9.1