Merge branch 'xjjdev'
This commit is contained in:
commit
e4be385783
@ -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"
|
||||
|
@ -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 BINARY inviter.invited_code = BINARY 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
|
||||
`
|
||||
|
Loading…
Reference in New Issue
Block a user