From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/article/mapper/ArticleIntegralMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleIntegralMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleIntegralMapper.xml
index 2ad0c5b..48724b9 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleIntegralMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleIntegralMapper.xml
@@ -12,9 +12,29 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
-
+ <!--自定义分页查询-->
<select id="selectArticleIntegralPage" resultMap="articleIntegralResultMap">
- select * from jczz_article_integral where is_deleted = 0
+ select
+ jai.*,
+ jh.house_name as address,
+ jh.district_name as aoiName,
+ bu.real_name,
+ bu.phone,
+ bu.avatar
+ from jczz_article_integral jai
+ left join jczz_house jh on jai.house_code = jh.house_code and jh.is_deleted = 0
+ left join blade_user bu on bu.id = jai.create_user and bu.is_deleted = 0
+ where jai.is_deleted = 0
+ <if test="articleIntegral.realName!=null and articleIntegral.realName!=''">
+ and bu.real_name like concat('%',#{articleIntegral.realName},'%')
+ </if>
+ <if test="articleIntegral.phone!=null and articleIntegral.phone!=''">
+ and bu.phone like concat('%',#{articleIntegral.phone},'%')
+ </if>
+ <if test="articleIntegral.articleId!=null">
+ and jai.article_id = #{articleIntegral.articleId}
+ </if>
+ order by jai.create_time desc
</select>
--
Gitblit v1.9.3