diff --git a/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java b/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java index a0edfd6..f8a6517 100644 --- a/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java +++ b/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java @@ -6,9 +6,7 @@ import com.example.rhizome.app.domain.model.Department; import com.example.rhizome.app.domain.model.SearchConditionDepartment; public interface SearchDepartment { - List searchDepartment(String nmDepartment); - - List searchDepartmentById(Integer idDepartment); + Department searchDepartmentById(Integer idDepartment); List selectAll(); diff --git a/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java b/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java index 2715659..8e82288 100644 --- a/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java +++ b/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java @@ -40,13 +40,13 @@ public class SearchDepartmentImpl implements SearchDepartment { * @param nmDepartment 検索対象の nmDepartment * @return Table から取得したレコードの情報 */ - public List searchDepartment(String nmDepartment) { + public List searchDepartmentByName(String nmDepartment) { return DepartmentEntity.createDepartmentList(departmentRepository.findByNmDepartment(nmDepartment).stream().toList()); } @Override - public List searchDepartmentById(Integer idDepartment) { - return DepartmentEntity.createDepartmentList(departmentRepository.findByIdDepartment(idDepartment).stream().toList()); + public Department searchDepartmentById(Integer idDepartment) { + return DepartmentEntity.createDepartment(departmentRepository.findByIdDepartment(idDepartment).orElse(new DepartmentEntity())); } /**