From 207cbc097fbd8b0e21c3af43f6748d0d8a4b0b84 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Fri, 31 Mar 2023 15:21:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E4=BC=9A=E7=BB=9F=E8=AE=A1=E5=B7=B2=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/artistinfo_artshowArtistSupplement.go | 1 + cmd/model/view_user.go | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/internal/logic/artistinfo_artshowArtistSupplement.go b/cmd/internal/logic/artistinfo_artshowArtistSupplement.go index 8a3d676..3734faa 100644 --- a/cmd/internal/logic/artistinfo_artshowArtistSupplement.go +++ b/cmd/internal/logic/artistinfo_artshowArtistSupplement.go @@ -9,6 +9,7 @@ package logic import ( "errors" "fmt" + "github.com/fonchain/fonchain-artistinfo/cmd/internal/dao" "github.com/fonchain/fonchain-artistinfo/cmd/model" "github.com/fonchain/fonchain-artistinfo/pb/artistInfoUser" diff --git a/cmd/model/view_user.go b/cmd/model/view_user.go index 647f75e..5f632d0 100644 --- a/cmd/model/view_user.go +++ b/cmd/model/view_user.go @@ -86,12 +86,12 @@ SELECT FROM sys_user su LEFT JOIN real_name rn ON rn.id = su.real_name_id -- 邀请者信息 -LEFT JOIN invite ON invite.invited_id = su.id -LEFT JOIN sys_user inviter ON inviter.invited_code = invite.invite_code -LEFT JOIN real_name inviter_rn ON inviter_rn.id = inviter.real_name_id +LEFT JOIN invite ON invite.invited_id = su.id AND invite.deleted_at =0 +LEFT JOIN sys_user inviter ON BINARY inviter.invited_code = BINARY invite.invite_code AND inviter.deleted_at =0 +LEFT JOIN real_name inviter_rn ON inviter_rn.id = inviter.real_name_id AND inviter.deleted_at =0 LEFT JOIN artshow_artist_supplement aas ON aas.artist_uid = su.mgmt_artist_uid AND aas.lock_time = ( - select MAX(lock_time) from artshow_artist_supplement WHERE artist_uid = su.mgmt_artist_uid - ) + select MAX(lock_time) from artshow_artist_supplement WHERE artist_uid = su.mgmt_artist_uid and deleted_at = 0 + ) and aas.deleted_at = 0 WHERE su.deleted_at = 0 `