From 0d951d54d1176fe817b7465c9f05253d10e14d6f Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 27 Jan 2021 09:11:52 +0800
Subject: [PATCH] 1、查询产品bug

---
 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 0227782..5e75ca7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -1260,7 +1260,7 @@
 				      (  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}
+			and a.company_id=#{record.companyId}
 		</if>
 		<if test="record.goodType!=null">
 			and a.good_type=#{record.goodType}
@@ -1289,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