jjxu/fonchain-artistinfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复冲突

Browse Source
This commit is contained in:
徐俊杰 2023-03-15 14:26:14 +08:00
parent c3584aad12
commit 8638fa1b7c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/internal/dao/artistInfo_user.go
View File

@ -437,7 +437,7 @@ func GetUserMsg(req *artistInfoUser.GetUserMsgRequest) (rep *artistInfoUser.GetU
func FindUser(req *artistInfoUser.FindUserRequest) (rep *artistInfoUser.UserInfo, err error) { func FindUser(req *artistInfoUser.FindUserRequest) (rep *artistInfoUser.UserInfo, err error) {
rep = &artistInfoUser.UserInfo{} rep = &artistInfoUser.UserInfo{}
var data = model.User{} var data = model.User{}
var tx = db.DB.Model(model.User{}).Preload("RealNameInfo").Preload("InvitedBy.UserInfo.RealNameInfo") var tx = db.DB.Model(model.User{}).Preload("RealNameInfo") //.Preload("InvitedBy.UserInfo.RealNameInfo")
if req.MgmtAccId != 0 { if req.MgmtAccId != 0 {
tx = tx.Where("mgmt_acc_id = ?", req.MgmtAccId) tx = tx.Where("mgmt_acc_id = ?", req.MgmtAccId)
} }
@ -585,7 +585,6 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U
// } // }
var inviterName, inviterCode string var inviterName, inviterCode string
// 查询邀请人信息 // 查询邀请人信息
// todo
inviterInfo := GetInviterInfo(v.InviteCode) inviterInfo := GetInviterInfo(v.InviteCode)
inviterCode = v.InviteCode inviterCode = v.InviteCode
inviterName = inviterInfo.RealName inviterName = inviterInfo.RealName

5
cmd/model/view_user.go
View File

@ -7,8 +7,9 @@
package model package model
import ( import (
"gorm.io/gorm"
"time" "time"
"gorm.io/gorm"
) )
type UserView struct { type UserView struct {
@ -86,7 +87,7 @@ FROM sys_user su
LEFT JOIN real_name rn ON rn.id = su.real_name_id LEFT JOIN real_name rn ON rn.id = su.real_name_id
-- 邀请者信息 -- 邀请者信息
LEFT JOIN invite ON invite.invited_id = su.id LEFT JOIN invite ON invite.invited_id = su.id
LEFT JOIN sys_user inviter ON inviter.id = invite.user_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 real_name inviter_rn ON inviter_rn.id = inviter.real_name_id
LEFT JOIN artshow_artist_supplement aas ON aas.artist_uid = su.mgmt_artist_uid LEFT JOIN artshow_artist_supplement aas ON aas.artist_uid = su.mgmt_artist_uid
WHERE WHERE