From f2b2542fcdef43d06999982fe7a85c91dd70c060 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Dec 2020 16:12:09 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java | 1 -
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsCategoryDao.xml | 5 ++++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
index 4f09d30..b6ab40e 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
@@ -44,7 +44,6 @@
ShoppingGoodsCategory category = new ShoppingGoodsCategory();
category.setShopId(user.getShopId());
- category.setName("家居产品");
return AjaxResult.buildSuccessInstance(shoppingGoodsCategoryService.findChildNodesByName(category));
}
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