From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsCategoryDao.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsCategoryDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsCategoryDao.xml
index 17278b1..1806262 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsCategoryDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsCategoryDao.xml
@@ -211,7 +211,10 @@
<select id="selectChildNodesByName" resultMap="ShoppingGoodsCategoryMap">
select * from shopping_goods_category a
- inner join shopping_goods_category b on a.parent_id=b.id and b.name=#{record.name} and b.parent_id=0
+ inner join shopping_goods_category b on a.parent_id=b.id and b.parent_id=0
+ <if test="record.name != null and record.name != ''">
+ and b.name=#{record.name}
+ </if>
<where>
<if test="record.shopId != null">
and a.shop_id=#{record.shopId}
--
Gitblit v1.9.1