From 1f869d1e5c9361645e7be28d2c27407d838a7d22 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Jan 2024 11:53:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml | 5 ++---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 6 +-----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
index a4dc151..a1510be 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -30,9 +30,8 @@
<select id="selectUserTopicsPage" resultMap="userTopicsResultMap">
- SELECT
+ SELECT distinct
jut.article_id,
- jut.id,
jut.delete_flag,
jut.signature_path,
jut.create_time,
@@ -61,7 +60,7 @@
<if test="userTopics.deleteFlag != null ">and jut.delete_flag = #{userTopics.deleteFlag}</if>
<if test="userTopics.articleId != null ">and jut.article_id = #{userTopics.articleId}
and jut.delete_flag = 0
- GROUP BY jut.article_id, jut.signature_path,jut.create_time,jut.id,jut.delete_flag,
+ GROUP BY jut.article_id, jut.signature_path,jut.create_time,jut.delete_flag,
bu.avatar,
bu.`name`,
bu.phone,
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index c022f78..028f6b4 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -172,11 +172,7 @@
AND jtrfr.phone like concat('%',#{vo.phone},'%')
</if>
<if test="vo.confirmFlag != null">
- AND (jtrfr.confirm_flag = #{vo.confirmFlag}
- <if test="vo.confirmUserId != null and vo.roleName!='网格员'">
- or jtrfr.confirm_user_id = #{vo.confirmUserId}
- </if>
- )
+ AND jtrfr.confirm_flag = #{vo.confirmFlag}
</if>
<if test="vo.status != null">
--
Gitblit v1.9.3