From ad3f115b29e3c33b32bd38855bdc5b9f2de381b1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 18:31:56 +0800
Subject: [PATCH] Merge branch 'ty_fix' into alpha

---
 zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml
index 1cdc488..bb312b7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml
@@ -232,7 +232,7 @@
 			<if test="record.articleTypeName != null and record.articleTypeName !='' ">
 				and article_type_name = #{record.articleTypeName}
 			</if>
-			<if test="record.parentId != null and record.parentId !='' ">
+			<if test="record.parentId != null or record.parentId ==0 ">
 				and parent_id = #{record.parentId}
 			</if>
 			<if test="record.sort != null and record.sort !='' ">

--
Gitblit v1.9.1