From 949efdc17fa833f6511c0e5902057f3be0fe72c4 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 10:58:57 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/ArticleDao.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleDao.xml
index d7b9b0c..25f544d 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleDao.xml
@@ -440,7 +440,8 @@
<select id="selectApiArticleListInPage" resultMap="ArticleMap">
select * from article a
- inner join article_type b on a.type_id=b.id and find_in_set(#{record.typeId}, b.parent_ids)
+ inner join article_type b on a.type_id=b.id
+ where a.type_id=#{record.typeId} or find_in_set(#{record.typeId}, b.parent_ids)
order by a.createtiem desc
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
<if test="pageVo.offset >=0 and pageVo.limit >0">
--
Gitblit v1.9.1