@@ -71,7 +71,11 @@ public class UserController {
|
|||||||
UserDTO userDTO = userMapper.toDTO(user);
|
UserDTO userDTO = userMapper.toDTO(user);
|
||||||
userDTO.setEmail(email);
|
userDTO.setEmail(email);
|
||||||
userDTO.setFullName(user.getFullName());
|
userDTO.setFullName(user.getFullName());
|
||||||
userDTO.setCompany(user.getCompany().getCompanyName());
|
|
||||||
|
if (user.getCompany() != null) {
|
||||||
|
userDTO.setCompany(user.getCompany().getCompanyName());
|
||||||
|
}
|
||||||
|
|
||||||
userDTO.setPhone(user.getPhone());
|
userDTO.setPhone(user.getPhone());
|
||||||
userDTO.setGenderType(user.getGenderType());
|
userDTO.setGenderType(user.getGenderType());
|
||||||
userDTO.setBirthday(user.getBirthday());
|
userDTO.setBirthday(user.getBirthday());
|
||||||
|
|||||||
Reference in New Issue
Block a user