diff --git a/EM-System/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java b/EM-System/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java index 8c33aa1..e48bd04 100644 --- a/EM-System/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java +++ b/EM-System/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java @@ -1,5 +1,17 @@ package com.example.rhizome.app.presentation.controller; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.servlet.http.HttpSession; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + import com.example.rhizome.aop.aspect.PermissionCheck; import com.example.rhizome.aop.aspect.SessionCheck; import com.example.rhizome.app.domain.service.SearchDepartment; @@ -7,16 +19,6 @@ import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAt import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.form.DepartmentForm; import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -import javax.servlet.http.HttpSession; -import java.util.logging.Level; -import java.util.logging.Logger; /** * 部署検索画面用コントローラ リスト全件表示、検索表示、更新、削除が可能 @@ -60,7 +62,7 @@ public class SelectDepartmentController { // 作成した部署一覧をセット model.addAttribute( PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, - DepartmentForm.convertFrom(searchDepartment.searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))) + DepartmentForm.convertFrom(searchDepartment.searchBy(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))) ); // 検索ページに遷移