fix update karyawan
This commit is contained in:
parent
aae740c77f
commit
cfb986b2d2
@ -37,6 +37,9 @@ func (u *User) ToEntity() *entity.User {
|
|||||||
RoleID: role.Role(u.RoleID),
|
RoleID: role.Role(u.RoleID),
|
||||||
PartnerID: u.PartnerID,
|
PartnerID: u.PartnerID,
|
||||||
SiteID: u.SiteID,
|
SiteID: u.SiteID,
|
||||||
|
NIK: u.NIK,
|
||||||
|
UserType: u.UserType,
|
||||||
|
PhoneNumber: u.PhoneNumber,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -238,7 +238,7 @@ func (r *UserRepository) UpdateUser(ctx context.Context, user *entity.UserDB) (*
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
if err := tx.Select("name", "email", "password", "status", "deleted_at", "updated_by").Save(user).Error; err != nil {
|
if err := tx.Select("name", "email", "password", "status", "deleted_at", "updated_by", "nik", "phone_number").Save(user).Error; err != nil {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
logError(ctx, "update user", err)
|
logError(ctx, "update user", err)
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@ -118,14 +118,14 @@ func (s *UserService) Update(ctx mycontext.Context, id int64, userReq *entity.Us
|
|||||||
}
|
}
|
||||||
|
|
||||||
//if changed branch
|
//if changed branch
|
||||||
if userReq.PartnerID != nil {
|
// if userReq.PartnerID != nil {
|
||||||
branch, err := s.branchRepo.GetBranchByID(ctx, *userReq.PartnerID)
|
// branch, err := s.branchRepo.GetBranchByID(ctx, *userReq.PartnerID)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
return nil, err
|
// return nil, err
|
||||||
}
|
// }
|
||||||
|
|
||||||
existingUser.PartnerName = branch.Name
|
// existingUser.PartnerName = branch.Name
|
||||||
}
|
// }
|
||||||
|
|
||||||
err = existingUser.ToUpdatedUser(*userReq)
|
err = existingUser.ToUpdatedUser(*userReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user