From fed1f885b03a5b4b7c62d44320c3ff2068ca02e6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 03 Feb 2021 11:01:24 +0800
Subject: [PATCH] confict
---
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