From bdd8e7862158b296f1930e4fa3a8a55fe109e058 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 20 Jan 2021 16:24:13 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 14 ++++++++++++++
1 files changed, 14 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 61df9a6..aa826ad 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -1255,6 +1255,13 @@
<if test="record.cateId!=null">
and a.cate_id in ( select b.id from shopping_goods_category b where (b.id=#{record.cateId} or b.parent_id=#{record.cateId}))
</if>
+ <if test="record.shopId != null and record.shopId !='' ">
+ <![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.goodType!=null">
+ and a.good_type=#{record.goodType}
+ </if>
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
<if test="pageVo.sort !=null and pageVo.order !=null">
order by ${pageVo.sort} ${pageVo.order}
@@ -1275,5 +1282,12 @@
<if test="record.cateId!=null">
and a.cate_id in ( select b.id from shopping_goods_category b where (b.id=#{record.cateId} or b.parent_id=#{record.cateId}))
</if>
+ <if test="record.shopId != null and record.shopId !='' ">
+ <![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.goodType!=null">
+ and a.good_type=#{record.goodType}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.1