段階２完了

段階１完了
2026-10-14 09:36:31 +09:00 · 2026-10-13 14:30:06 +09:00
27 changed files with 585 additions and 532 deletions
--- a/.classpath
+++ b/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="optional" value="true"/>
@@ -14,21 +14,20 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
-			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
--- a/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java
@@ -1,17 +1,14 @@
 package com.example.rhizome.app.domain.service;

-import java.util.List;
-
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;

+import java.util.List;
+
 public interface SearchDepartment {
-	//すべての部署を取得する
    List<Department> selectAll();
-    //部署ID・部署目の完全一致検索
+
    List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
-    //部署名の部分一致検索
+
    List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
-    //↑下から変更 SelectDepartmentControllerのsearchByWithLikeでエラーでたから
-    //List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
 }
--- a/src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDeparmentImpl.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDeparmentImpl.java
@@ -0,0 +1,34 @@
+package com.example.rhizome.app.domain.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.rhizome.app.domain.service.DeleteDepartment;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
+
+/**
+ * Department レコード削除関連の機能を持つサービス
+ */
+@Service
+@Transactional
+public class DeleteDeparmentImpl implements DeleteDepartment{
+	DepartmentRepository departmentRepository;
+
+	@Autowired
+    public DeleteDeparmentImpl(DepartmentRepository departmentRepository) {
+		 this.departmentRepository = departmentRepository;
+
+	}
+
+
+	/**
+	 * idDepartment を元に department データを削除
+	 *
+	 * @param idDepartmetn 削除対象のidDepartment
+	 */
+	public void deleteDepartment(Integer idDepartment) {
+		departmentRepository.deleteById(idDepartment);
+	}
+
+}
--- a/src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDepartmentImpl.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDepartmentImpl.java
@@ -1,22 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.example.rhizome.app.domain.service.DeleteDepartment;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-public class DeleteDepartmentImpl implements DeleteDepartment {
-	 DepartmentRepository departmentRepository;
-
-	    @Autowired
-	    public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
-	        this.departmentRepository = departmentRepository;
-	    }
-
-	    public void deleteDepartment(Integer idDepartment) {
-	        // ★考える：Repository のどのメソッドで「IDを指定して削除」できる？
-	        //          （お手本の DeleteEmployeeImpl を見る）
-	    	departmentRepository.deleteById(idDepartment);
-	    }
-
-}
--- a/src/main/java/com/example/rhizome/app/domain/service/impl/DeleteEmployeeImpl.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/impl/DeleteEmployeeImpl.java
@@ -1,12 +1,10 @@
 package com.example.rhizome.app.domain.service.impl;

-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.example.rhizome.app.domain.service.DeleteEmployee;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

 /**
 * Employee レコード削除関連の機能を持つサービス
--- a/src/main/java/com/example/rhizome/app/domain/service/impl/LoginImpl.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/impl/LoginImpl.java
@@ -1,15 +1,13 @@
 package com.example.rhizome.app.domain.service.impl;

-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.example.rhizome.app.domain.model.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.Login;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

 /**
 * ログイン系の機能を集約させるサービスクラスです。
--- 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
@@ -1,29 +1,25 @@
 package com.example.rhizome.app.domain.service.impl;


-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;

 /**
 * 部署情報検索系の機能を集約させるサービスクラスです。
 */
-//サービスクラスとして登録
@Service
-//トランザクション管理
@Transactional
 public class SearchDepartmentImpl implements SearchDepartment {

-	//Repositoryを保持するフィールド
    DepartmentRepository departmentRepository;

    /**
@@ -71,7 +67,6 @@ public class SearchDepartmentImpl implements SearchDepartment {
     * @param searchConditionDepartment 検索条件
     * @return 検索結果のレコード
     */
-    @Override
    public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
        // 動的に検索条件を絞り込む
        // Specification は Criteria API の Predicate をラップしたもの
--- a/src/main/java/com/example/rhizome/app/domain/service/searchDepartmentinfo.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/searchDepartmentinfo.java
@@ -0,0 +1,17 @@
+package com.example.rhizome.app.domain.service;
+
+import java.util.List;
+
+import com.example.rhizome.app.domain.model.EmployeeInfo;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+
+public interface searchDepartmentinfo {
+	List<EmployeeInfo> selectAll();
+
+    static List<EmployeeInfo> searchBy(SearchConditionDepartment searchConditionDepartment) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+}
+
+
--- a/src/main/java/com/example/rhizome/app/infra/entity/EmployeeEntity.java
+++ b/src/main/java/com/example/rhizome/app/infra/entity/EmployeeEntity.java
@@ -7,23 +7,16 @@
 package com.example.rhizome.app.infra.entity;


-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import javax.persistence.*;
+import java.util.List;
+
 /**
 * EmployeeテーブルのEntity
 *
@@ -44,7 +37,6 @@ public class EmployeeEntity {
    @Column(name = "id_employee", nullable = false)
    private Integer idEmployee;

-
    /**
     * 社員名
     */
@@ -72,7 +64,6 @@ public class EmployeeEntity {
    /**
     * 管理者権限
     */
-//    @Transient
    @Column(name = "admin_auth", nullable = false)
    private Integer adminAuth;

--- a/src/main/java/com/example/rhizome/app/infra/repository/DepartmentRepository.java
+++ b/src/main/java/com/example/rhizome/app/infra/repository/DepartmentRepository.java
@@ -1,13 +1,11 @@
 package com.example.rhizome.app.infra.repository;

+import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

-//DepartmentRntity: 部署の実体
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-

 /**
 * Specification:
@@ -21,15 +19,11 @@ import com.example.rhizome.app.infra.entity.DepartmentEntity;
 * CriteriaBuilder:条件式（Where句以降の条件）の部分のクエリを作るためのビルダーです。
 * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
 */
-
-//部署情報をデータベースから取得するRepository
-//                                           JpaRepositoryを継承する
@Repository
 public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {

-//部署IDの完全一致検索条件を作成する
+
    static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-        //部署IDがnullなら条件を設定しない
        return idDepartment == null ?
                null :
                // 戻り値の型 Specification<DepartmentEntity> にキャスト
@@ -39,9 +33,7 @@ public interface DepartmentRepository extends JpaRepository<DepartmentEntity, In
                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
    }

-    //部署名の完全一致条件を作成する
    static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
-    	//部署名が未入力なら条件を設定しない
        return (nmDepartment == null || nmDepartment.isEmpty()) ?
                null :
                (Specification<DepartmentEntity>)
--- a/src/main/java/com/example/rhizome/app/presentation/controller/DeleteDepartmentController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/DeleteDepartmentController.java
@@ -1,5 +1,8 @@
 package com.example.rhizome.app.presentation.controller;

+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;

@@ -12,61 +15,121 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;

+import com.example.rhizome.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.DeleteDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployee;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 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 com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
+import com.example.rhizome.app.presentation.form.MessageForm;

+/**
+ * 削除処理のコントロータ
+ */
@Controller
 public class DeleteDepartmentController {
+
+	// ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
+
+	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+	final String UNKNOWN_ID = "削除対象のIDが不明です。";
+	final String DELETE_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除できません。";
+	final String DELETE_COMPLETE = "削除しました。";

 	HttpSession httpSession;
 	DeleteDepartment deleteDepartment;
 	SearchDepartment searchDepartment;
-	    SearchEmployee searchEmployee;   // 所属社員の確認に使う（既存）
+	SearchEmployee searchEmployee;

-        //コンストラクタ
 	@Autowired
-	    public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment,
-	                                      SearchDepartment searchDepartment, SearchEmployee searchEmployee) {
+	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
+			HttpSession httpSession, SearchEmployee searchEmployee) {
 		this.httpSession = httpSession;
 		this.deleteDepartment = deleteDepartment;
 		this.searchDepartment = searchDepartment;
 		this.searchEmployee = searchEmployee;
 	}

-	    @RequestMapping(value = TransitionTargetPageNameKeyword.DELETE_DEPARTMENT, method = RequestMethod.POST)
-	    public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment, Model model) {
-
-	        final String UNKNOWN_ID = "削除対象のIDが不明です。";
-	        final String HAS_EMPLOYEE = "1名以上が所属している部署は削除出来ません。";
-	        final String DELETE_COMPLETE = "削除しました。";
+	/**
+	 * 削除処理のコントローラ
+	 *
+	 * @param idDepartment 削除対象のdepartmentId
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
+	public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {

 		try {
-	            // ★① idDepartment が null、または searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) が空
-	            //     → MESSAGE_ERROR に UNKNOWN_ID を載せて一覧へ
-	        	deleteDepartment.deleteDepartment(idDepartment);
-	            // ★② searchEmployee.searchEmployeeByIdDepartment(idDepartment) が空でない
-	            //     → MESSAGE_ERROR に HAS_EMPLOYEE を載せて一覧へ
-	        	model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,DepartmentForm.convertFrom(searchDepartment.selectAll()));
-	            // ★③ deleteDepartment.deleteDepartment(idDepartment) → MESSAGE_INFO に DELETE_COMPLETE を載せて一覧へ
-	        	model.addAttribute("searchConditinDepartmentForm", new SearchConditionDepartmentForm());
-
-//	            return "一覧へ戻る（ステップ 2-5 で決める）";
+			if (idDepartment == null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, UNKNOWN_ID);
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-	        } catch (Exception e) {
+			} else {

-	            httpSession.invalidate();
-	            e.printStackTrace();
-	            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-	            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,"部署を削除できませんでした");
-//	            return TransitionTargetPageNameKeyword.ERROR_HTML;
-	            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+				// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+				// 作成した部署一覧をセット
+				model.addAttribute(
+						PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+
+				// 削除処理実施
+				deleteExec(
+						model,
+						idDepartment,
+						LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
+
+				// 検索画面に遷移
+				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
 			}
+		} catch (Exception e) {
+			// ログイン情報の破棄
+			httpSession.invalidate();
+
+			e.printStackTrace();
+			// エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			// エラー画面遷移
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+	}
+
+	/**
+	 * 削除処理実施
+	 *
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @param idDepartment 削除対象のdepartmentId
+	 * @param loginUser  ログインユーザー情報
+	 */
+
+	private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
+
+		// 1名以上が所属している場合
+		if (loginUser != null && Objects.equals(loginUser.getIdDepartment(), idDepartment)) {
+			// 削除対象だった場合
+			// エラーメッセージをセット
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
+			// 検索画面に遷移
+			return;
+		}
+
+		// 削除を実施
+		deleteDepartment.deleteDepartment(idDepartment);
+		;
+
+		// 削除完了したメッセージをセット
+		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+
 	}
 }
--- a/src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java
@@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ public class DeleteEmployeeController {
            // 作成した部署一覧をセット
            model.addAttribute(
                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
            );

            // 削除処理実施
--- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java
@@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
 import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,7 +75,7 @@ public class InsertEmployeeConfirmController {
            // 作成した部署一覧をセット
            model.addAttribute(
                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(
+                    DepartmentInfoForm.convertFrom(
                            searchDepartment.selectAll()
                    ));

--- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java
@@ -8,7 +8,7 @@ import com.example.rhizome.app.domain.service.impl.RegisterEmployeeImpl;
 import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +71,7 @@ public class InsertEmployeeController {
            // 作成した部署一覧をセット
            model.addAttribute(
                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(
+                    DepartmentInfoForm.convertFrom(
                            searchDepartment.selectAll()
                    ));

--- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeInputController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeInputController.java
@@ -6,7 +6,7 @@ import com.example.rhizome.app.domain.service.RegisterEmployee;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -64,7 +64,7 @@ public class InsertEmployeeInputController {

        try {
            // 部署コードリストを作成し、画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));

            // パラメータをセット
            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
--- a/src/main/java/com/example/rhizome/app/presentation/controller/LoginController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/LoginController.java
@@ -1,20 +1,6 @@
 package com.example.rhizome.app.presentation.controller;


-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-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.app.domain.model.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.Login;
@@ -25,6 +11,18 @@ import com.example.rhizome.app.presentation.form.LoginInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdatePersonalUserForm;
+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;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DO_LOGIN;

 /**
 * ログイン関連のコントローラ
@@ -108,8 +106,7 @@ public class LoginController {
                // 編集対象のログイン者の情報を画面に渡す値にセット
                model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, UpdatePersonalUserForm.convertFrom(loginUser));
                // 個人の情報更新ページに遷移
-                  return TransitionTargetPageNameKeyword.MENU_HTML;
-//                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
+                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
            }

            // メニュー画面に遷移
--- a/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java
@@ -2,7 +2,6 @@ package com.example.rhizome.app.presentation.controller;

 import java.util.logging.Level;
 import java.util.logging.Logger;
-//import java.util.List;

 import javax.servlet.http.HttpSession;

@@ -13,115 +12,103 @@ 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;
+import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 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 com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartment;

-/**
- * 部署検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
- */
-
-//          検索Controller
@Controller
 public class SelectDepartmentController {
-
 	// ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
 	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";

-	//    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-
-	//    private static final String DEPARTMENT_HTML = "/department";
-
 	HttpSession httpSession;
 	SearchDepartment searchDepartment;
+	SearchEmployeeInfo searchEmployeeInfo;

 	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment serchDepartment) {
+	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
 		this.httpSession = httpSession;
-		this.searchDepartment = serchDepartment;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployeeInfo = searchEmployeeInfo;
 	}

-	//空の検索条件FormをこのControllerの画面用に用意する
 	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartmentForm();
+	public SearchConditionDepartment searchConditionDepartment() {
+		return new SearchConditionDepartment();
 	}

-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-		try {
-			// ★考える：①検索サービスを呼ぶ（Form→Model変換 → 部分一致のメソッド）
-			//          ②結果(List<Department>)を DepartmentForm.convertFrom(...) で画面用に変換
-			//          ③ model に PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST という名前で載せる
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm
-					.convertFrom(searchDepartment.searchByWithLike(SearchConditionDepartmentForm
-							.convertTo(searchConditionDepartmentForm))));
-
-			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-		} catch (Exception e) {
-			//httpSessionを破棄
-			httpSession.invalidate();
-
-			//エラー内容を出力
-			e.printStackTrace();
-
-			//ログにエラーを記録
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-
-			//エラー画面へ遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY, method = RequestMethod.POST)
-	public String select(Model model) {
-		try {
-			// ★全件取得 → DepartmentForm に変換 → DEPARTMENT_FORM_LIST で model へ
-			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-		} catch (Exception e) {
-			httpSession.invalidate();
-			e.printStackTrace();
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-
-		}
-
-	}
-}
-
-/**
+	/**
 	 * 社員検索画面表示処理コントローラ
 	 *
- * @param searchConditionEmployeeForm 検索画面のフォーム
+	 * @param searchConditionDepartment 検索画面のフォーム
 	 * @param model                       ビューにデータを渡すためのコンテナ
 	 * @return 遷移先の画面
 	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
+	public String select(SearchConditionDepartment searchConditionDepartment, Model model) {

-//    @PermissionCheck
-//    @SessionCheck
-//    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT,
-//    method = RequestMethod.POST)
-//    public String showDepartment() {
-//    	
-//        return TransitionTargetPageNameKeyword.DEPARTMENT_HTML;
-//
-//    
-//    @RequestMapping(value =TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-//    public String select(DepartmentForm departmentForm, Model model) {
-//    	try {
-//    		
-//    		model.addAttribute(
-//    				PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST,EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(
-//                          SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm())
-//    				);		
+		try {

-//    /**
-//     * 社員検索画面表示処理コントローラ
-//     * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
-//     *
-//     * @param model ビューにデータを渡すためのコンテナ
-//     * @return 遷移先の画面
+			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			// 作成した部署一覧をセット
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+
+			// 検索条件を元に検索を実施
+			// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(
+					searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment))));
+			// 検索ページに遷移
+			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+
+		} catch (Exception e) {
+			// ログイン情報の破棄
+			httpSession.invalidate();
+
+			e.printStackTrace();
+
+			// エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			// エラー画面遷移
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+	}
+
+	/**
+	 * 部署検索画面表示処理コントローラ
+	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
+	 *
+	 * @param model ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
+	public String select(Model model) {
+
+		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+		// 作成した部署一覧をセット
+		model.addAttribute(
+				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+				DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+
+		// 検索条件を元に検索を実施
+		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+				DepartmentInfoForm.convertFrom(
+						searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment()))));
+
+		// 検索ページに遷移
+		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+	}
+}
--- a/src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java
@@ -18,7 +18,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.EmployeeInfoForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;

@@ -33,8 +33,6 @@ public class SelectEmployeeController {
    // エラーメッセージ用の定数フィールド
    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";

-    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-
    HttpSession httpSession;
    SearchDepartment searchDepartment;
    SearchEmployeeInfo searchEmployeeInfo;
@@ -65,22 +63,19 @@ public class SelectEmployeeController {

        try {

-
            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
            // 作成した部署一覧をセット
            model.addAttribute(
                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
            );

            // 検索条件を元に検索を実施
-            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
            model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
            // 検索ページに遷移
            return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;


-            
        } catch (Exception e) {
            // ログイン情報の破棄
            httpSession.invalidate();
@@ -111,7 +106,7 @@ public class SelectEmployeeController {
        // 作成した部署一覧をセット
        model.addAttribute(
                PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentForm.convertFrom(searchDepartment.selectAll())
+                DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
        );

        // 検索条件を元に検索を実施
--- a/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeController.java
@@ -8,7 +8,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -67,7 +67,7 @@ public class UpdateEmployeeController {

        try {
            // 部署一覧を取得し画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));

            // id を条件に更新対象のレコードを検索、取得する
            List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy(
--- a/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeResultController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeResultController.java
@@ -11,7 +11,7 @@ import com.example.rhizome.app.domain.service.UpdateEmployee;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -91,7 +91,7 @@ public class UpdateEmployeeResultController {
        try {

            // 部署一覧取得
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));

            // パスワードが仕様を満たしているか確認
            String error = UpdateEmployeeInfoForm.validatePassword(
--- a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java
@@ -21,8 +21,7 @@ public class TransitionTargetPageNameKeyword {
 	public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
 	public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
 	public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
-    public static final String DEPARTMENT_HTML = "department";
-
+	public static final String SELECT_DEPARTMENT_HTML = "/selectDepartment";
 	public static final String ERROR_HTML = "error";

 	// 共通(Controller)
@@ -31,7 +30,6 @@ public class TransitionTargetPageNameKeyword {
 	public static final String INDEX_LOGIN = "/login";
 	public static final String LOGOUT = "/logout";
 	public static final String DO_LOGIN = "/doLogin";
-//    public static final String DEPARTMENT_HTML = "/department";

 	// 一般向け(Controller)
 	public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
@@ -46,24 +44,12 @@ public class TransitionTargetPageNameKeyword {
 	public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
 	public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
 	public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
-    public static final String SHOW_DEPARTMENT = "/department";
-//    public static final String SELECT_DEPARTMENT = "/selectDepartment";
-    
-
-
-    
-
-    // Department
-    // HTML             実装手順書ステップ1-2通りの定数追加
-    public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
-    
-    // Controller       実装手順書ステップ1-2通りの定数追加 -> 管理者向けと重複、エラーでたため一旦コメアウト
-    public static final String SELECT_DEPARTMENT = "/selectDepartment";
-    
- // ステップ2-3*TransitionTargetPageNameKeyword の Department(Controller) の枠に追記
+	public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
+	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY ="/departmentAll"; 
 	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-    
-    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
+	// Department
+	// HTML
+	// Controller

 	/**
 	 * 管理者向けのページリストを返す
@@ -78,7 +64,6 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
-                DELETE_EMPLOYEE,
 				INSERT_EMPLOYEE_INPUT,
 				INSERT_EMPLOYEE_CONFIRM,
 				INSERT_EMPLOYEE,
@@ -87,9 +72,10 @@ public class TransitionTargetPageNameKeyword {
 				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
 				SHOW_UPDATE_EMPLOYEE,
 				UPDATE_EMPLOYEE_RESULT,
-                SELECT_DEPARTMENT              
+				SELECT_DEPARTMENT_INFO,
+				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
+				DELETE_DEPARTMENT);
 		
-        );
 	}

 	/**
@@ -104,9 +90,7 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
-                PERSONAL_UPDATE_RESULT,
-                SHOW_DEPARTMENT
-        );
+				PERSONAL_UPDATE_RESULT);
 	}

 }
--- a/src/main/java/com/example/rhizome/app/presentation/form/DepartmentInfoForm.java
+++ b/src/main/java/com/example/rhizome/app/presentation/form/DepartmentInfoForm.java
@@ -1,21 +1,19 @@
 package com.example.rhizome.app.presentation.form;

-import java.util.List;
-
 import com.example.rhizome.app.domain.model.Department;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import java.util.List;
+
 /**
 * 画面の表示に使う部署コード管理用のクラス
 */
-//            部署のフォーム
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class DepartmentForm {
+public class DepartmentInfoForm {
    /**
     * 部署ID
     */
@@ -32,8 +30,8 @@ public class DepartmentForm {
     * @param department business 層の Department インスタンス
     * @return 画面用（presentation 層）の DepartmentForm インスタンス
     */
-    public static DepartmentForm convertFrom(Department department) {
-        return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
+    public static DepartmentInfoForm convertFrom(Department department) {
+        return new DepartmentInfoForm(department.getIdDepartment(), department.getNmDepartment());
    }

    /**
@@ -43,7 +41,7 @@ public class DepartmentForm {
     * @param departmentList business 層の Department インスタンスのリスト
     * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト
     */
-    public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
-        return departmentList.stream().map(DepartmentForm::convertFrom).toList();
+    public static List<DepartmentInfoForm> convertFrom(List<Department> departmentList) {
+        return departmentList.stream().map(DepartmentInfoForm::convertFrom).toList();
    }
 }
--- a/src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartment.java
+++ b/src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartment.java
@@ -0,0 +1,50 @@
+package com.example.rhizome.app.presentation.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SearchConditionDepartment {
+	/**
+	 * 部署ID
+	 */
+	private Integer idDepartment;
+	/**
+	 * 部署名
+	 */
+	private String nmDepartment;
+
+	/**
+	 * business 層の SearchConditionDepartment クラスから画面用（presentation 層）の SearchConditionDepartement に
+	 * 変換します。
+	 *
+	 * @param searchConditionDepartement business 層の SearchConditionDepartment インスタンス
+	 * @return 画面用（presentation 層）の SearchConditionDepartment インスタンス
+	 */
+	public static SearchConditionDepartment convertFrom(
+			com.example.rhizome.app.domain.model.SearchConditionDepartment searchConditionDepartment) {
+		return new SearchConditionDepartment(
+				searchConditionDepartment.getIdDepartment(),
+				searchConditionDepartment.getNmDepartment());
+	}
+
+	/**
+	 * 画面用（presentation 層）の SearchConditionDepartement クラスから business 層の SearchConditionDepartement クラスに
+	 * 変換します。
+	 *
+	 * @param searchConditionDepartement 画面用（presentation 層）の SearchConditionDepartement インスタンス
+	 * @return business 層の SearchConditionDepartement インスタンス
+	 */
+	public static com.example.rhizome.app.domain.model.SearchConditionDepartment convertTo(
+			SearchConditionDepartment searchConditionDepartment) {
+		return new com.example.rhizome.app.domain.model.SearchConditionDepartment(
+				searchConditionDepartment.getIdDepartment(),
+				searchConditionDepartment.getNmDepartment());
+	}
+}
--- a/src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartmentForm.java
+++ b/src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartmentForm.java
@@ -1,26 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-//          部署の検索条件
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SearchConditionDepartmentForm {
-	//部署ID
-	private Integer idDepartment;
-	//部署名
-	private String nmDepartment;
-	
-	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm form) {
-		//SearchConditonDepartment();の中身：Formの2つの値を返す
-		return new SearchConditionDepartment(
-				form.getIdDepartment(),
-				form.getNmDepartment()
-				);
-	}
-}
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,3 +1,3 @@
 spring.datasource.url=jdbc:mysql://localhost:3306/rezodb
-spring.datasource.username=rezouser1
-spring.datasource.password=Rezo_0001
+spring.datasource.username=rezouser
+spring.datasource.password=Rezo_0000
--- a/src/main/resources/templates/menu.html
+++ b/src/main/resources/templates/menu.html
@@ -10,52 +10,36 @@
 	<link rel="stylesheet" th:href="@{/css/all.css}">
 	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
 	<title>メニュー</title>
-	    <style>
-			.container{
-				width: 100%;
-				overflow: hidden;
-			}
-			.column{
-				width: 48%;
-				float: left;
-				margin: 1%;
-			}
-		</style>

 </head>

 <body>
-<h1>
+	<h1>
 		メインメニュー　　　
 		<div class="rightSection">
 			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
-</h1>
-<table class="menuClass">
+	</h1>
+	<table class="menuClass">
 		<tr>
 			<td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
 			</td>
-        <td class="description">登録済みのユーザ一覧表示と更新、削除を行います。</td>
+			<td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
+			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i>部署検索</a>
+			</td>
+			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
 		</tr>

 		<tr>
 			<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
 			<td class="description">新規でユーザ追加を行います。</td>
-    </tr>
-	
-	<tr>
-	    <td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
+			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
 			</td>
-	    <td class="description">登録済みの部署一覧表示と更新、削除を行います。</td>
-	</tr>
-	
-	<tr>
-	    <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
 			<td class="description">新規で部署追加を行います。</td>
-	</tr>

-</table>
+
+	</table>
 </body>

 <script type="text/javascript">
@@ -81,7 +65,7 @@
 	function selectDepartmentSubmit() {
 		const form = document.createElement('form');
 		form.setAttribute('method', 'post');
-        form.setAttribute('action', 'selectDepartment');
+		form.setAttribute('action', 'selectDepartmentInfo');

 		// 動的送信用のHidden
 		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
--- a/src/main/resources/templates/selectDepartment.html
+++ b/src/main/resources/templates/selectDepartment.html
@@ -1,84 +1,106 @@
 <!DOCTYPE html>
-<!--<html>   HTML文書の開始タグ-->
-<!--<head>   ページの設定情報を含む部分-->
-<!--<title>  ページのタイトルを指定するタグ-->
-<!--<body>   実際に表示される内容を記述する部分-->
-<!--<h1>     見出し最大サイズ・<p>段落の基本タグ-->
-<!--<div>    汎用のブロック要素　複数の要素をまとめてレイアウトするためのコンテナ-->
-<!--<table>	 表全体を囲む-->
-<!--<tr>     行全体を囲む-->
-<!--<th>     行見出しセルを囲む-->
-<!--<td>     行データセルを囲む-->
-<!--<a href ="URL"> 飛び先のURLを指定"> -->
-	
-	
 <html xmlns:th="http://www.thymeleaf.org">
+
 <head>
 	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+	<!-- 外部のスクリプトファイルを読み込む -->
 	<script th:src="@{/js/common.js}"></script>
+	<!-- CSSの読み込み -->
 	<link rel="stylesheet" th:href="@{/css/all.css}">
 	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>部署検索</title>
+	<title>検索</title>
+
 </head>
+
 <body>
-<h1>
-    部署検索条件入力　　　
+	<h1>
+		検索条件入力　　　
 		<div class="rightSection">
 			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
-</h1>
+	</h1>
+
+	<form action="selectDepartmentInfo" method="post" th:object="${searchConditionDepartment}">

-<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
 		<div class="msgBox error" th:if="${messageError} != null">
 			<span class="error" th:text="${messageError.message}"></span>
 		</div>
+
 		<table>
 			<tr>
 				<th class="header">部署ID</th>
-            <td><input placeholder="部署ID" th:field="*{idDepartment}" type="number"/></td>
+				<td>
+					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
+				</td>
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
-            <td><input type="text" th:field="*{nmDepartment}"></td>
+				<td>
+					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+				</td>
 			</tr>
 			<tr>
-            <td class="btnArea" colspan="2"><input type="submit" value="検索"/></td>
-            <td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
+				<td class="btnArea" colspan="2">
+					<input type="submit" value="検索" />
+				</td>
+				<td class="btnArea" colspan="2">
+					<button onclick="clearInput()">クリア</button>
+				</td>
 			</tr>
 		</table>
-</form>
+	</form>

-<a href="showMenu">メニューに戻る</a>
-<h1><span>検索結果</span></h1>
-
-<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
-
-<!--<table th:if="${departmentFormList != null and !departmentFromList.isEmpty()}">-->
-
-	<table th:each="departmentForm : ${departmentFormList}">
-
-<tr>
-	<th>部署ID</th>
-	<th>部署名</th>
-</tr>
-<!--    <tr th:each="department:${departmentFormList}">-->
+	<div class="header-spacing"></div>
+	<a href="showMenu">メニューに戻る</a>
+	<div class="header-spacing"></div>
+	<h1><span>検索結果</span></h1>
+	<div class="header-spacing"></div>
+	<th:block th:if="${messageInfo != null}">
+		<script th:inline="javascript">
+			alert([[${messageInfo.message}]]);
+		</script>
+	</th:block>
+	<div class="header-spacing"></div>
+	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+		<!-- 検索結果が1件以上ある場合 -->
+		<table class="table-grid table-striped table-hover">
+			<thead>
+				<tr>
+					<th style="width: 60px;">部署ID</th>
+					<th style="width: 100px;">部署名</th>
+					<th style="width: 60px;">操作</th>
+				</tr>
+</body>
+</thead>
+<tbody>
+	<tr th:each="departmentForm : ${departmentFormList}">
 		<td th:text="${departmentForm.idDepartment}"></td>
 		<td th:text="${departmentForm.nmDepartment}"></td>
+		<td>
+			<!-- 削除フォーム -->
+			<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
+				style="display: inline;">
+				<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
+				<input type="submit" value="削除">
+			</form>
+		</td>
 	</tr>
+</tbody>
 </table>
-
-<p th:if="${departmentFormList != null and departmentFormList.isEmpty()}">
+</th:block>
+<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+	<!-- 検索結果が0件の場合 -->
 	検索結果はありません。
-</p>
-
+</th:block>

 </body>
 <script type="text/javascript">
+
 	function clearInput() {
 		document.getElementById('idDepartment').value = '';
-        // ★部署名の入力欄も空にする（id は th:field が自動で作る）
-		
+		document.getElementById('nmDepartment').value = '';
 	}
 </script>
+
 </html>
Author	SHA1	Message	Date
o-matsuda	1bc88d8d69	段階２完了	2026-10-14 09:36:31 +09:00
o-matsuda	4ae84b53e6	段階１完了	2026-10-13 14:30:06 +09:00