team/tydata-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复申请代理空指针

Browse Source
This commit is contained in:
liangzai
2025-06-25 21:36:18 +08:00
parent f39cb4ac2e
commit a71eca725e
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/main/api/internal/service/userService.go
View File

@@ -207,11 +207,13 @@ func (s *UserService) TempUserBindUser(ctx context.Context, session sqlx.Session
return errors.New("无临时用户")
}
// 使用事务上下文查询临时用户
userTemp, err := s.userTempModel.FindOne(ctx, claims.UserId)
if err != nil {
return err
}
// 检查是否已经注册过
userAuth, err := s.userAuthModel.FindOneByAuthTypeAuthKey(ctx, userTemp.AuthType, userTemp.AuthKey)
if err != nil && !errors.Is(err, model.ErrNotFound) {
return err
@@ -230,7 +232,13 @@ func (s *UserService) TempUserBindUser(ctx context.Context, session sqlx.Session
if err != nil {
return err
}
err = s.userTempModel.DeleteSoft(ctx, session, userTemp)
// 重新获取最新的userTemp数据，确保版本号是最新的
latestUserTemp, err := s.userTempModel.FindOne(ctx, claims.UserId)
if err != nil {
return err
}
err = s.userTempModel.DeleteSoft(ctx, session, latestUserTemp)
if err != nil {
return err
}
@@ -249,13 +257,18 @@ func (s *UserService) TempUserBindUser(ctx context.Context, session sqlx.Session
if err != nil {
return err
}
err = s.userTempModel.DeleteSoft(ctx, session, userTemp)
// 重新获取最新的userTemp数据，确保版本号是最新的
latestUserTemp, err := s.userTempModel.FindOne(ctx, claims.UserId)
if err != nil {
return err
}
err = s.userTempModel.DeleteSoft(ctx, session, latestUserTemp)
if err != nil {
return err
}
return nil
}
}
// _bak_RegisterUUIDUser 注册UUID用户，返回用户ID