From ec0c71cc88407098e0c088dbf1e44cddf856b8f8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 26 Jan 2021 16:30:55 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 3 +++
1 files changed, 3 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..0227782 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 !='' ">
+ a.company_id=#{record.companyId}
+ </if>
<if test="record.goodType!=null">
and a.good_type=#{record.goodType}
</if>
--
Gitblit v1.9.1