|
|
@@ -26,17 +26,21 @@ func NewGetUserLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUserLo
|
|
|
}
|
|
|
|
|
|
func (l *GetUserLogic) GetUser(in *transform.UserRequest) (*transform.UserResponse, error) {
|
|
|
- tfr, user := transform.UserResponse{}, &model.SysUser{}
|
|
|
- var err error
|
|
|
+ var tfr transform.UserResponse
|
|
|
+ var user model.SysUser
|
|
|
if in.Id != "" && in.Id != "0" {
|
|
|
- user, err = l.svcCtx.SysUserModel.FindOne(in.Id)
|
|
|
+ u, err := l.svcCtx.SysUserModel.FindOne(in.Id)
|
|
|
if err != nil && err != sqlc.ErrNotFound {
|
|
|
return &tfr, nil
|
|
|
+ } else if u != nil {
|
|
|
+ user = *u
|
|
|
}
|
|
|
} else if in.Phone != "" {
|
|
|
- user, err = l.svcCtx.SysUserModel.FindOneByPhone(in.Phone)
|
|
|
+ u, err := l.svcCtx.SysUserModel.FindOneByPhone(in.Phone)
|
|
|
if err != nil && err != sqlc.ErrNotFound {
|
|
|
return &tfr, nil
|
|
|
+ } else if u != nil {
|
|
|
+ user = *u
|
|
|
}
|
|
|
}
|
|
|
tfr.Id = user.Id
|
|
|
@@ -54,5 +58,5 @@ func (l *GetUserLogic) GetUser(in *transform.UserRequest) (*transform.UserRespon
|
|
|
return &tfr, nil
|
|
|
}
|
|
|
}
|
|
|
- return &tfr, nil
|
|
|
+ return &tfr, err
|
|
|
}
|
2637309949