From d939ad8f0b3890156ae0e0289100a242fbbfe4a4 Mon Sep 17 00:00:00 2001
From: o-yamamoto <2026_04_00886@it-college.co.jp>
Date: Tue, 8 Sep 2026 13:14:04 +0900
Subject: [PATCH] =?UTF-8?q?=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4[=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E5=90=8D=E6=A4=9C=E7=B4=A2=E3=82=92=E3=81=82=E3=81=84?=
 =?UTF-8?q?=E3=81=BE=E3=81=84=E6=A4=9C=E7=B4=A2=E3=81=8B=E3=82=89=E5=AE=8C?=
 =?UTF-8?q?=E5=85=A8=E4=B8=80=E8=87=B4=E6=A4=9C=E7=B4=A2=E3=81=B8=E3=81=AE?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4]?=
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)))
             );
 
             // 検索ページに遷移