|
|
|
@ -488,7 +488,8 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
convert.setIsManager(Boolean.FALSE);
|
|
|
|
|
if (user.getCompanyId() != null) {
|
|
|
|
|
companyByUserId = companyService.findCompanyById(user.getCompanyId());
|
|
|
|
|
if (companyByUserId != null && companyByUserId.getStatus() != null) {
|
|
|
|
|
if (companyByUserId != null) {
|
|
|
|
|
convert.setCompanyType(companyByUserId.getCompanyType());
|
|
|
|
|
convert.setCompanyStatus(companyByUserId.getStatus());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -505,6 +506,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
if (role.getId() == DefaultNumberConstants.EIGHT_NUMBER) {
|
|
|
|
|
convert.setIsManager(Boolean.TRUE);
|
|
|
|
|
if (companyByUserId != null) {
|
|
|
|
|
|
|
|
|
|
convert.setUserBalance(companyByUserId.getUserBalance());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|