From 97a6138814f3fc4fa66be5d24571b5e424d7f30b Mon Sep 17 00:00:00 2001 From: y-okumura <26-y-okumura-kyoeisystems@it-college.co.jp> Date: Fri, 11 Sep 2026 14:41:47 +0900 Subject: [PATCH] =?UTF-8?q?#19=E3=80=80=E3=80=90=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=80=91=E3=81=82=E3=81=84=E3=81=BE=E3=81=84?= =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=81=8B=E3=82=89=E5=AE=8C=E5=85=A8=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E6=A4=9C=E7=B4=A2=E3=81=B8=E3=81=AE=E6=A9=9F=E8=83=BD?= =?UTF-8?q?=E6=94=B9=E4=BF=AE=EF=BC=9A=E3=82=B3=E3=83=BC=E3=83=89=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelectDepartmentController.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) 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))) ); // 検索ページに遷移