This commit is contained in:
@@ -51,7 +51,7 @@ public class Company {
|
|||||||
@ToString.Exclude
|
@ToString.Exclude
|
||||||
private List<User> users = new ArrayList<>();
|
private List<User> users = new ArrayList<>();
|
||||||
|
|
||||||
@OneToOne(cascade = CascadeType.ALL)
|
@OneToOne(cascade = CascadeType.MERGE)
|
||||||
@JoinColumn(name = "tariff_info_id")
|
@JoinColumn(name = "tariff_info_id")
|
||||||
private TariffInfo tariffInfo;
|
private TariffInfo tariffInfo;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -167,8 +167,17 @@ public class TariffInfoService {
|
|||||||
@Transactional
|
@Transactional
|
||||||
public void linkCompanyTariffInfo(Long userId, TariffInfo tariffInfo) {
|
public void linkCompanyTariffInfo(Long userId, TariffInfo tariffInfo) {
|
||||||
User user = userRepository.findById(userId).orElse(null);
|
User user = userRepository.findById(userId).orElse(null);
|
||||||
|
log.info("user: " + user);
|
||||||
|
log.info("user: " + user);
|
||||||
|
log.info("user: " + user);
|
||||||
|
log.info("user: " + user);
|
||||||
|
log.info("Company: " + user.getCompany());
|
||||||
|
log.info("Company: " + user.getCompany());
|
||||||
|
log.info("Company: " + user.getCompany());
|
||||||
|
log.info("Company: " + user.getCompany());
|
||||||
|
|
||||||
if (user != null && user.getCompany() != null) {
|
|
||||||
|
if (user.getCompany() != null) {
|
||||||
Company company = user.getCompany();
|
Company company = user.getCompany();
|
||||||
company.setTariffInfo(tariffInfo);
|
company.setTariffInfo(tariffInfo);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user