From 162fd6cf9cc47858c29d0b488bd7f018b77a56b4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 11:29:49 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 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