From 4705f9b4084d9ccddb601569b223f0fb41778a94 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 12 Aug 2021 15:28:46 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 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 61df9a6..5200088 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -855,7 +855,7 @@
<select id="selectById" resultMap="ShoppingGoodsMap">
select
*,
- (select TYPE_NAME from sys_goods_type b where b.id=goods_sort_id) goodsSortName,
+ -- (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
(select NAME from shopping_goods_category t where
t.id=cate_id)
cate_name
@@ -1255,6 +1255,16 @@
<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.companyId != null and record.companyId !='' ">
+ and a.company_id=#{record.companyId}
+ </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 +1285,30 @@
<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.companyId != null and record.companyId !='' ">
+ and a.company_id=#{record.companyId}
+ </if>
+ <if test="record.goodType!=null">
+ and a.good_type=#{record.goodType}
+ </if>
+ </select>
+
+ <select id="selectByIds" resultMap="ShoppingGoodsSimpleMap">
+ select
+ *
+ from shopping_goods
+ where id in
+ <foreach collection="ids" item="item" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </select>
+
+ <select id="selectByNameAndDesc" resultMap="ShoppingGoodsSimpleMap">
+ select * from shopping_goods
+ where name=#{name} and wei_description=#{description}
</select>
</mapper>
--
Gitblit v1.9.1