fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
eson 2023-08-29 14:36:53 +08:00
parent 8908273af5
commit 229fe8f2d8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
model/gmodel/fs_user_logic.go
View File

@ -59,7 +59,7 @@ func InheritGuestIdResource(tx *gorm.DB, userId, guestId int64, afterDo func(txR
Where("guest_id = ?", guestId). Where("guest_id = ?", guestId).
UpdateColumn("user_id", userId).Error UpdateColumn("user_id", userId).Error
if err != nil { if err != nil && err != gorm.ErrRecordNotFound {
return err return err
} }
txUserMaterial := tx.Model(&FsUserMaterial{}) txUserMaterial := tx.Model(&FsUserMaterial{})
@ -67,7 +67,7 @@ func InheritGuestIdResource(tx *gorm.DB, userId, guestId int64, afterDo func(txR
Where("guest_id = ?", guestId). Where("guest_id = ?", guestId).
UpdateColumn("user_id", userId).Error UpdateColumn("user_id", userId).Error
if err != nil { if err != nil && err != gorm.ErrRecordNotFound {
return err return err
} }
@ -75,7 +75,7 @@ func InheritGuestIdResource(tx *gorm.DB, userId, guestId int64, afterDo func(txR
err = txUserInfo. err = txUserInfo.
Where("guest_id = ?", guestId). Where("guest_id = ?", guestId).
UpdateColumn("user_id", userId).Error UpdateColumn("user_id", userId).Error
if err != nil { if err != nil && err != gorm.ErrRecordNotFound {
return err return err
} }

2
server/auth/internal/logic/useremailconfirmationlogic.go
View File

@ -118,7 +118,7 @@ func (l *UserEmailConfirmationLogic) UserEmailConfirmation(req *types.RequestEma
// log.Println("aaaa", token) // log.Println("aaaa", token)
user, err := l.svcCtx.AllModels.FsUser.RegisterByFusen(l.ctx, token) user, err := l.svcCtx.AllModels.FsUser.RegisterByFusen(l.ctx, token)
if err != nil { if err != nil {
logx.Error(err, token.TraceId) logx.Error(err, ":", token.TraceId)
return resp.SetStatus(basic.CodeDbSqlErr) return resp.SetStatus(basic.CodeDbSqlErr)
} }