From cd9bde664172eb94ff8190fe2708e74726e29bc5 Mon Sep 17 00:00:00 2001 From: artem <208artems208@gmail.com> Date: Thu, 11 Dec 2025 21:16:40 +0300 Subject: [PATCH] fix --- .../nto/service/impl/EmployeeServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java index 2307946..e5b581a 100644 --- a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java @@ -2,8 +2,10 @@ package com.example.nto.service.impl; import com.example.nto.entity.Booking; import com.example.nto.entity.Employee; +import com.example.nto.entity.Place; import com.example.nto.repository.EmployeeRepository; import com.example.nto.service.EmployeeService; +import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,6 +31,7 @@ public class EmployeeServiceImpl implements EmployeeService { } @Override + @Transactional public Optional> getEmployeeInfo(String code) { Optional employeeOpt = employeeRepository.findByCode(code); @@ -43,12 +46,17 @@ public class EmployeeServiceImpl implements EmployeeService { Map> bookingsMap = new HashMap<>(); - // Используем bookingList вместо bookings if (employee.getBookingList() != null) { for (Booking booking : employee.getBookingList()) { Map bookingInfo = new HashMap<>(); bookingInfo.put("id", booking.getId()); - bookingInfo.put("place", booking.getPlace()); + + Place place = booking.getPlace(); + String placeName = ""; + if (place != null) { + placeName = place.getPlace(); + } + bookingInfo.put("place", placeName); bookingsMap.put(booking.getDate().toString(), bookingInfo); }