From ccca8c65b3c76a9021a471a3667d61d965a4f2cb Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期六, 11 五月 2024 18:04:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/resources/mapper/FeedbackMapper.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/resources/mapper/FeedbackMapper.xml b/src/main/resources/mapper/FeedbackMapper.xml index 6b6c8d0..64180f6 100644 --- a/src/main/resources/mapper/FeedbackMapper.xml +++ b/src/main/resources/mapper/FeedbackMapper.xml @@ -26,7 +26,8 @@ c.real_name as userName from t_feedback a left join t_text_content b on a.content_id = b.id - left join t_user c on a.user_id = c.id and deleted = 0 + left join t_user c on a.user_id = c.id and c.deleted = 0 + where a.deleted = 0 order by id desc </select> </mapper> -- Gitblit v1.8.0