From 3954537f11c1c6fbfc62a6233102c530e3202ba1 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 10 Jul 2021 14:25:55 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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..c315f93 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
@@ -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,8 +1289,21 @@
<![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>
</mapper>
--
Gitblit v1.9.1