段階２完了

.gitignore

@@ -1,2 +1 @@
 /target/
-/bin/

src/main/java/com/example/rhizome/app/domain/model/DepartmentInfo.java

@@ -1,25 +0,0 @@
-package com.example.rhizome.app.domain.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-//コピペのみ、部署用に修正必要
-
-/**
- * 部署情報の概念を表現するモデルクラスです。
- */
-
-@Getter
-@AllArgsConstructor
-
-public class DepartmentInfo {
-	/**
-     * 社員情報
-     */
-    private final Employee employee;
-    /**
-     * 部署名
-     */
-    private final Department department;
-
-}

src/main/java/com/example/rhizome/app/domain/service/DeleteDepartment.java

@@ -1,5 +1,5 @@
 package com.example.rhizome.app.domain.service;
 
 public interface DeleteDepartment {
-    void deleteDepartment(Integer idDepartment);
+	void deleteDepartment(Integer idDepartment);
-}
+}

src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDeparmentImpl.java

@@ -7,21 +7,28 @@ import org.springframework.transaction.annotation.Transactional;
 import com.example.rhizome.app.domain.service.DeleteDepartment;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
-//@Srviceをつけ忘れるとControllerで使うときに起動時エラーになってしまう
+/**
+ * Department レコード削除関連の機能を持つサービス
+ */
 @Service
 @Transactional
-public class DeleteDepartmentImpl implements DeleteDepartment {
+public class DeleteDeparmentImpl implements DeleteDepartment{
-
 	DepartmentRepository departmentRepository;
 
 	@Autowired
-	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
+    public DeleteDeparmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
+		 this.departmentRepository = departmentRepository;
+
 	}
 
+
+	/**
+	 * idDepartment を元に department データを削除
+	 *
+	 * @param idDepartmetn 削除対象のidDepartment
+	 */
 	public void deleteDepartment(Integer idDepartment) {
-		// ★考える：Repository のどのメソッドで「IDを指定して削除」できる？
-		//          （お手本の DeleteEmployeeImpl を見る）
 		departmentRepository.deleteById(idDepartment);
 	}
-}
+
+}

src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentInfo.java

@@ -1,12 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import java.util.List;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
-public interface SearchDepartmentInfo {
-	List<Department> selectAll();
-
-	List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
-}

src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentInfoImpl.java

@@ -1,59 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import java.util.List;
-
-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.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.infra.repository.DepartmentInfoRepository;
-
-/**
- * SearchDepartmentInfoImpl (employee join department) 検索系の機能を集約させるサービスクラスです
- */
-@Service
-@Transactional
-public class SearchDepartmentInfoImpl implements SearchDepartmentInfo {
-
-	DepartmentInfoRepository departmentInfoRepository;
-
-	@Autowired
-	public SearchDepartmentInfoImpl(DepartmentInfoRepository departmentInfoRepository) {
-		this.departmentInfoRepository = departmentInfoRepository;
-	}
-
-	/**
-	 * DepartmentInfo (employee join department) のレコードを全件取得
-	 *
-	 * @return 取得したレコード全件
-	 */
-	public List<Department> selectAll() {
-
-		return null;//EmployeeDepartmentEntity.createDepartmentInfoList(departmentInfoRepository.findAll());
-
-	}
-
-	/**
-	 * SearchConditionDepartment の情報を元に DepartmentInfo (employee join department) のレコードを取得
-	 *
-	 * @param searchConditionDepartment 検索条件
-	 * @return 検索結果のレコードリスト
-	 */
-	public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
-		// 動的に検索条件を絞り込む
-		// Specification は Criteria API の Predicate をラップしたもの
-		return null;
-//				EmployeeDepartmentEntity
-//				.createDepartmentInfoList(
-//						departmentInfoRepository.findAll(Specification
-//								.where(EmployeeInfoRepository
-//										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-//								.and(EmployeeInfoRepository
-//										.idDepartmentEqual(searchConditionDepartment.getNmDepartment()))
-//
-//						));
-
-	}
-}

src/main/java/com/example/rhizome/app/domain/service/impl/SearchEmployeeInfoImpl.java

@@ -1,17 +1,16 @@
 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.EmployeeInfo;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
 import com.example.rhizome.app.infra.repository.EmployeeInfoRepository;
+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;
 
 /**
  * SearchEmployeeInfoImpl (employee join department) 検索系の機能を集約させるサービスクラスです

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;
+	}
+}
+
+

src/main/java/com/example/rhizome/app/infra/entity/EmployeeDepartmentEntity.java

@@ -1,28 +1,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.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-
 import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.DepartmentInfo;
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.EmployeeInfo;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+
+import javax.persistence.*;
+import java.util.List;
 
 /**
  * Employee + Department の Join 情報を保持するEntity
@@ -126,10 +114,5 @@ public class EmployeeDepartmentEntity {
 
     }
 
-	public static List<DepartmentInfo> createDepartmentInfoList(List<EmployeeDepartmentEntity> all) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
 
 }

src/main/java/com/example/rhizome/app/infra/repository/DepartmentInfoRepository.java

@@ -1,28 +0,0 @@
-package com.example.rhizome.app.infra.repository;
-
-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;
-
-import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
-
-@Repository
-public interface DepartmentInfoRepository
-		extends JpaRepository<EmployeeDepartmentEntity, Integer>, JpaSpecificationExecutor<EmployeeDepartmentEntity> {
-	static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-		return idDepartment == null ? null :
-		// 戻り値の型 Specification<EmployeeDepartmentEntity> にキャスト
-				(Specification<EmployeeDepartmentEntity>)
-				// ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
-				// を作成している
-				(root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
-	}
-
-	static Specification<EmployeeDepartmentEntity> nmDepartmentEqual(String nmDepartment) {
-		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
-				: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
-						.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
-	}
-
-}

src/main/java/com/example/rhizome/app/infra/repository/EmployeeInfoRepository.java

@@ -1,12 +1,11 @@
 package com.example.rhizome.app.infra.repository;
 
+import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
 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;
 
-import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
-
 /**
  * ワンポイント情報（ここで登場する関数型インターフェース Specification について解説します）
  * Specification:
@@ -54,9 +53,9 @@ public interface EmployeeInfoRepository extends JpaRepository<EmployeeDepartment
                         (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("mailAddress"), "%" + mailAddress + "%");
     }
 
-    static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer integer) {
+    static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) {
         return (root, query, criteriaBuilder) ->
-                integer == null ? null :
+                idDepartment == null ? null :
-                        criteriaBuilder.equal(root.join("department").get("idDepartment"), integer);
+                        criteriaBuilder.equal(root.join("department").get("idDepartment"), idDepartment);
     }
 }

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,68 +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.app.domain.model.SearchConditionDepartment;
+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.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,
+	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
-			SearchDepartment searchDepartment, SearchEmployee searchEmployee) {
+			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) {
+	 *
-
+	 * @param idDepartment 削除対象のdepartmentId
-		final String UNKNOWN_ID = "削除対象のIDが不明です。";
+	 * @param model      ビューにデータを渡すためのコンテナ
-		final String HAS_EMPLOYEE = "1名以上が所属している部署は削除出来ません。";
+	 * @return 遷移先の画面
-		final String DELETE_COMPLETE = "削除しました。";
+	 */
+	@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)) が空
+			if (idDepartment == null) {
-			//     → MESSAGE_ERROR に UNKNOWN_ID を載せて一覧へ
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, UNKNOWN_ID);
-			if (idDepartment == null
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					|| searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)).isEmpty()) {
+						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
 				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-			}
+			} else {
-			// ★② searchEmployee.searchEmployeeByIdDepartment(idDepartment) が空でない
-			//     → MESSAGE_ERROR に HAS_EMPLOYEE を載せて一覧へ
-			if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
-				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-			}
-			// ★③ deleteDepartment.deleteDepartment(idDepartment) → MESSAGE_INFO に DELETE_COMPLETE を載せて一覧へ
-			deleteDepartment.deleteDepartment(idDepartment);
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
 
-			//以下がメッセージの載せ方
+				// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			//model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
+				// 作成した部署一覧をセット
-			return "一覧へ戻る（ステップ 2-5 で決める）";
+				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));
+
+	}
 }

src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java

@@ -1,6 +1,5 @@
 package com.example.rhizome.app.presentation.controller;
 
-import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -13,67 +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.app.domain.model.Department;
+import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+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.SearchConditionDepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartment;
 
 @Controller
 public class SelectDepartmentController {
-
+	// ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
+	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
 	SearchDepartment searchDepartment;
+	SearchEmployeeInfo searchEmployeeInfo;
 
 	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
+	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
 		this.httpSession = httpSession;
 		this.searchDepartment = searchDepartment;
+		this.searchEmployeeInfo = searchEmployeeInfo;
 	}
 
-	/** 空の検索条件Formを、この Controller の画面用に用意する */
 	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+	public SearchConditionDepartment searchConditionDepartment() {
-		return new SearchConditionDepartmentForm();
+		return new SearchConditionDepartment();
 	}
 
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
+	/**
-	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+	 * 社員検索画面表示処理コントローラ
-		try {
+	 *
-			// ★考える：①検索サービスを呼ぶ（Form→Model変換 → 部分一致のメソッド）
+	 * @param searchConditionDepartment 検索画面のフォーム
-			//          ②結果(List<Department>)を DepartmentForm.convertFrom(...) で画面用に変換
+	 * @param model                       ビューにデータを渡すためのコンテナ
-			//          ③ model に PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST という名前で載せる
+	 * @return 遷移先の画面
-			SearchConditionDepartment searchCondition = new SearchConditionDepartment(
+	 */
-					searchConditionDepartmentForm.getIdDepartment(),
+	@PermissionCheck
-					searchConditionDepartmentForm.getNmDepartment());
+	@SessionCheck
-			List<Department> departmentList = searchDepartment.searchByWithLike(searchCondition);
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, departmentList);
+	public String select(SearchConditionDepartment searchConditionDepartment, Model model) {
 
+		try {
+
+			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			// 作成した部署一覧をセット
+			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;
 		}
 	}
 
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY, method = RequestMethod.POST)
+	/**
+	 * 部署検索画面表示処理コントローラ
+	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
+	 *
+	 * @param model ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_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;
-		}
 
+		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+		// 作成した部署一覧をセット
+		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;
 	}
-}
+}

src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java

@@ -9,7 +9,6 @@ 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -59,7 +58,7 @@ public class SelectEmployeeController {
      */
     @PermissionCheck
     @SessionCheck
-    @PostMapping(TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO)
+    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO, method = RequestMethod.POST)
     public String select(SearchConditionEmployeeForm searchConditionEmployeeForm, Model model) {
 
         try {
@@ -72,7 +71,6 @@ public class SelectEmployeeController {
             );
 
             // 検索条件を元に検索を実施
-            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
             model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
             // 検索ページに遷移
             return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;

src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java

@@ -5,15 +5,14 @@ package com.example.rhizome.app.presentation.controller.pageproperty;
  */
 public class PageReturnAttributeKeyword {
 
-	public static final String MESSAGE_ERROR = "messageError";
+    public static final String MESSAGE_ERROR = "messageError";
-	public static final String MESSAGE_INFO = "messageInfo";
+    public static final String MESSAGE_INFO = "messageInfo";
+
+    public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
+    public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
+    public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
+    public static final String LOGIN_INFO_FORM = "loginInfoForm";
+    public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
+    public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
 
-	public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
-	public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
-	public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
-	public static final String LOGIN_INFO_FORM = "loginInfoForm";
-	public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
-	public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
-	//追加
-	public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList";
 }

src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java

@@ -21,7 +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 SELECT_DEPARTMENT_HTML = "/selectDepartment";
 	public static final String ERROR_HTML = "error";
 
 	// 共通(Controller)
@@ -44,14 +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 SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
+	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY ="/departmentAll"; 
+	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
 	// Department
 	// HTML
-	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
 	// Controller
-	public static final String SELECT_DEPARTMENT = "/selectDepartment";
-	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
 
 	/**
 	 * 管理者向けのページリストを返す
@@ -66,7 +64,6 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
-				DELETE_EMPLOYEE,
 				INSERT_EMPLOYEE_INPUT,
 				INSERT_EMPLOYEE_CONFIRM,
 				INSERT_EMPLOYEE,
@@ -74,7 +71,11 @@ public class TransitionTargetPageNameKeyword {
 				SELECT_EMPLOYEE_INFO,
 				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
 				SHOW_UPDATE_EMPLOYEE,
-				UPDATE_EMPLOYEE_RESULT);
+				UPDATE_EMPLOYEE_RESULT,
+				SELECT_DEPARTMENT_INFO,
+				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
+				DELETE_DEPARTMENT);
+		
 	}
 
 	/**

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());
+	}
+}

src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartmentForm.java

@@ -1,40 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SearchConditionDepartmentForm {
-
-	/**
-	 * 部署ID
-	 */
-	private Integer idDepartment;
-
-	/**
-	 * 部署名
-	 */
-	private String nmDepartment;
-
-	/**
-	 * business 層の SearchConditionDepartment クラスから画面用（presentation 層）の SearchConditionDepartmentForm に
-	 * 変換します。
-	 *
-	 * @param searchConditionDepartment business 層の SearchConditionDepartment インスタンス
-	 * @return 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
-	 */
-	public static SearchConditionDepartmentForm convertTo(SearchConditionDepartmentForm form) {
-		return new SearchConditionDepartmentForm(
-				//getterで取得した部署IDを渡す
-				form.getIdDepartment(),
-				//getterで取得した部署名を渡す
-				form.getNmDepartment());
-	}
-
-}

src/main/resources/templates/insertDpartmentInput.html

@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-	<meta charset="UTF-8">
-	<title>Insert title here</title>
-</head>
-
-<body>
-	<!DOCTYPE html>
-	<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>
-	</head>
-
-	<body>
-		<h1>
-			部署登録　　　
-			<div class="rightSection">
-				<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-				<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-			</div>
-		</h1>
-		<form action="insertDepartmentConfirm" method="post" th:object="${insertDepartmentForm}">
-
-			<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>
-						<label>
-							<input class="readOnly" readonly="readonly" type="text" value="自動で設定されます" />
-						</label>
-					</td>
-				</tr>
-				<tr>
-					<th class="header">部署名</th>
-					<td>
-						<label>
-							<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-								type="text" />
-						</label>
-					</td>
-				</tr>
-				<tr>
-					<th class="header">所属部署</th>
-					<td>
-						<label>
-							<select required="required" th:field="*{idDepartment}">
-								<option th:each="department : ${departmentFormList}"
-									th:selected="${insertDepartmentForm.idDepartment != null && department.idDepartment == insertDepartmentForm.idDepartment}"
-									th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
-								</option>
-							</select>
-						</label>
-					</td>
-				</tr>
-				<tr>
-					<td class="btnArea" colspan="2">
-						<input type="submit" value="登録確認" />
-					</td>
-				</tr>
-			</table>
-		</form>
-		<a href="showMenu">メニューに戻る</a>
-	</body>
-
-	</html>
-</body>
-
-</html>

src/main/resources/templates/menu.html

@@ -26,101 +26,98 @@
 			<td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
 			</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>
+			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
-
-		<!--部署検索機能表示-->
-		<tr>
-			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
 			</td>
-			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
+			<td class="description">新規で部署追加を行います。</td>
-		</tr>
+
 
 	</table>
+</body>
 
+<script type="text/javascript">
+	function selectEmployeeSubmit() {
+		const form = document.createElement('form');
+		form.setAttribute('method', 'post');
+		form.setAttribute('action', 'selectEmployeeInfo');
 
+		// 動的送信用のHidden
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		const inputField = document.createElement("input");
+		inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("value", "selectEmployeeInfo");
 
+		form.appendChild(inputField);
 
-	<script type="text/javascript">
+		// フォームをDOMに追加
-		function selectEmployeeSubmit() {
+		document.body.appendChild(form);
-			const form = document.createElement('form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'selectEmployeeInfo');
 
-			// 動的送信用のHidden
+		form.submit();
-			// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+	}
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("value", "selectEmployeeInfo");
 
-			form.appendChild(inputField);
+	function selectDepartmentSubmit() {
+		const form = document.createElement('form');
+		form.setAttribute('method', 'post');
+		form.setAttribute('action', 'selectDepartmentInfo');
 
-			// フォームをDOMに追加
+		// 動的送信用のHidden
-			document.body.appendChild(form);
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		const inputField = document.createElement("input");
+		inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("value", "selectDepartment");
 
-			form.submit();
+		form.appendChild(inputField);
-		}
 
-		function selectDepartmentSubmit() {
+		// フォームをDOMに追加
-			const form = document.createElement('form');
+		document.body.appendChild(form);
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'selectDepartment');
 
-			// 動的送信用のHidden
+		form.submit();
-			// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+	}
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("value", "selectDepartment");
 
-			form.appendChild(inputField);
+	function insertEmployeeSubmit() {
+		const form = document.createElement('form');
+		form.setAttribute('method', 'post');
+		form.setAttribute('action', 'insertEmployeeInput');
 
-			// フォームをDOMに追加
+		// 動的送信用のHidden
-			document.body.appendChild(form);
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		const inputField = document.createElement("input");
+		inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("value", "insertEmployeeInput");
 
-			form.submit();
+		form.appendChild(inputField);
-		}
 
-		function insertEmployeeSubmit() {
+		// フォームをDOMに追加
-			const form = document.createElement('form');
+		document.body.appendChild(form);
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'insertEmployeeInput');
 
-			// 動的送信用のHidden
+		form.submit();
-			// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+	}
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("value", "insertEmployeeInput");
 
-			form.appendChild(inputField);
+	function insertDepartmentSubmit() {
+		const form = document.createElement('form');
+		form.setAttribute('method', 'post');
+		form.setAttribute('action', 'insertDepartmentInput');
 
-			// フォームをDOMに追加
+		// 動的送信用のHidden
-			document.body.appendChild(form);
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		const inputField = document.createElement("input");
+		inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("value", "insertDepartmentInput");
 
-			form.submit();
+		form.appendChild(inputField);
-		}
 
-		function insertDepartmentSubmit() {
+		// フォームをDOMに追加
-			const form = document.createElement('form');
+		document.body.appendChild(form);
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'insertDepartmentInput');
 
-			// 動的送信用のHidden
+		form.submit();
-			// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+	}
-			const inputField = document.createElement("input");
+</script>
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("value", "insertDepartmentInput");
-
-			form.appendChild(inputField);
-
-			// フォームをDOMに追加
-			document.body.appendChild(form);
-
-			form.submit();
-		}
-	</script>
 
 </html>

src/main/resources/templates/selectDepartment.html

@@ -3,88 +3,104 @@
 
 <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>
-		部署検索条件入力　　　
+		検索条件入力　　　
 		<div class="rightSection">
 			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
 	</h1>
 
-	<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
+	<form action="selectDepartmentInfo" method="post" th:object="${searchConditionDepartment}">
+
 		<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 placeholder="部署名" th:field="*{nmDepartment}" type="text" /></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">
-				<td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
+					<input type="submit" value="検索" />
+				</td>
+				<td class="btnArea" colspan="2">
+					<button onclick="clearInput()">クリア</button>
+				</td>
 			</tr>
 		</table>
 	</form>
 
+	<div class="header-spacing"></div>
 	<a href="showMenu">メニューに戻る</a>
+	<div class="header-spacing"></div>
 	<h1><span>検索結果</span></h1>
-
+	<div class="header-spacing"></div>
-	<!-- 【修正】th:ifのリスト名を controller と一致させる -->
+	<th:block th:if="${messageInfo != null}">
-	<table class="table-grid table-striped table-hover"
+		<script th:inline="javascript">
-		th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+			alert([[${messageInfo.message}]]);
-		<thead>
+		</script>
-			<tr>
-				<th style="width: 60px;">部署ID</th>
-				<th style="width: 100px;">部署名</th>
-				<th style="width: 150px;">操作</th>
-			</tr>
-		</thead>
-		<tbody>
-			<!-- 【修正】ループ内で使う変数名を departmentForm に統一 -->
-			<tr th:each="departmentForm : ${departmentFormList}">
-				<td th:text="${departmentForm.idDepartment}"></td>
-				<td th:text="${departmentForm.nmDepartment}"></td>
-				<td>
-					<!-- 更新フォーム -->
-					<form action="showUpdate" method="post" style="display: inline;">
-						<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-						<input type="submit" value="更新">
-					</form>
-					<!-- 削除フォーム -->
-					<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>
-
-	<!-- 0件の時にメッセージを表示 -->
-	<th:block th:if="${departmentFormList != null and departmentFormList.size() == 0}">
-		<p>検索結果はありません</p>
 	</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>
+</th:block>
+<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+	<!-- 検索結果が0件の場合 -->
+	検索結果はありません。
+</th:block>
 
 </body>
-
 <script type="text/javascript">
+
 	function clearInput() {
 		document.getElementById('idDepartment').value = '';
 		document.getElementById('nmDepartment').value = '';
 	}
 </script>
 
-</html>
+</html>

src/main/resources/templates/selectEmployee.html

@@ -3,144 +3,155 @@
 
 <head>
 
-	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-	<!-- 外部のスクリプトファイルを読み込む -->
+    <!-- 外部のスクリプトファイルを読み込む -->
-	<script th:src="@{/js/common.js}"></script>
+    <script th:src="@{/js/common.js}"></script>
-	<!-- CSSの読み込み -->
+    <!-- CSSの読み込み -->
-	<link rel="stylesheet" th:href="@{/css/all.css}">
+    <link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>検索</title>
+    <title>検索</title>
 
 </head>
-
 <body>
-	<h1>
+<h1>
-		検索条件入力　　　
+    検索条件入力　　　
-		<div class="rightSection">
+    <div class="rightSection">
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
+    </div>
-	</h1>
+</h1>
-	<form action="selectEmployeeInfo" method="post" th:object="${searchConditionEmployeeForm}">
+<form action="selectEmployeeInfo"
+      method="post"
+      th:object="${searchConditionEmployeeForm}">
 
-		<div class="msgBox error" th:if="${messageError} != null">
+    <div class="msgBox error" th:if="${messageError} != null">
-			<span class="error" th:text="${messageError.message}"></span>
+        <span class="error" th:text="${messageError.message}"></span>
-		</div>
+    </div>
-		<table>
+    <table>
-			<tr>
+        <tr>
-				<th class="header">社員ID</th>
+            <th class="header">社員ID</th>
-				<td>
+            <td>
-					<input placeholder="社員ID" th:field="*{idEmployee}" type="number" />
+                <input placeholder="社員ID"
-				</td>
+                       th:field="*{idEmployee}"
-			</tr>
+                       type="number"/>
-			<tr>
+            </td>
-				<th class="header">社員名</th>
+        </tr>
-				<td>
+        <tr>
-					<input placeholder="社員名" th:field="*{nmEmployee}" type="text" />
+            <th class="header">社員名</th>
-				</td>
+            <td>
-			</tr>
+                <input placeholder="社員名"
-			<tr>
+                       th:field="*{nmEmployee}"
-				<th class="header">社員名フリガナ</th>
+                       type="text"/>
-				<td>
+            </td>
-					<input oninput="convertToKatakana(this)" placeholder="フリガナ" th:field="*{knEmployee}" type="text" />
+        </tr>
-				</td>
+        <tr>
-			</tr>
+            <th class="header">社員名フリガナ</th>
-			<tr>
+            <td>
-				<th class="header">メールアドレス</th>
+                <input oninput="convertToKatakana(this)"
-				<td>
+                       placeholder="フリガナ"
-					<input placeholder="メールアドレス" th:field="*{mailAddress}" type="email" />
+                       th:field="*{knEmployee}"
-				</td>
+                       type="text"/>
-			</tr>
+            </td>
-			<tr>
+        </tr>
-				<th class="header">所属部署</th>
+        <tr>
-				<td>
+            <th class="header">メールアドレス</th>
-					<select th:field="*{idDepartment}">
+            <td>
-						<option value=""></option>
+                <input placeholder="メールアドレス"
-						<option th:each="department : ${departmentFormList}"
+                       th:field="*{mailAddress}"
-							th:selected="${searchConditionEmployeeForm.idDepartment != null && department.idDepartment == searchConditionEmployeeForm.idDepartment}"
+                       type="email"/>
-							th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
+            </td>
-						</option>
+        </tr>
-					</select>
+        <tr>
-				</td>
+            <th class="header">所属部署</th>
-			</tr>
+            <td>
-			<tr>
+                <select th:field="*{idDepartment}">
-				<td class="btnArea" colspan="2">
+                    <option value=""></option>
-					<input type="submit" value="検索" />
+                    <option th:each="department : ${departmentFormList}"
-				</td>
+                            th:selected="${searchConditionEmployeeForm.idDepartment != null && department.idDepartment == searchConditionEmployeeForm.idDepartment}"
-				<td class="btnArea" colspan="2">
+                            th:text="${department.nmDepartment}"
-					<button onclick="clearInput()">クリア</button>
+                            th:value="${department.idDepartment}">
-				</td>
+                    </option>
-			</tr>
+                </select>
-		</table>
+            </td>
-	</form>
+        </tr>
-
+        <tr>
-	<div class="header-spacing"></div>
+            <td class="btnArea" colspan="2">
-	<a href="showMenu">メニューに戻る</a>
+                <input type="submit" value="検索"/>
-	<div class="header-spacing"></div>
+            </td>
-	<h1><span>検索結果</span></h1>
+            <td class="btnArea" colspan="2">
-	<div class="header-spacing"></div>
+                <button onclick="clearInput()">クリア</button>
-	<th:block th:if="${messageInfo != null}">
+            </td>
-		<script th:inline="javascript">
+        </tr>
-			alert([[${messageInfo.message}]]);
+    </table>
-		</script>
+</form>
-	</th:block>
+<div class="header-spacing"></div>
-	<div class="header-spacing"></div>
+<a href="showMenu">メニューに戻る</a>
-	<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
+<div class="header-spacing"></div>
-		<!-- 検索結果が1件以上ある場合 -->
+<h1><span>検索結果</span></h1>
-		<table class="table-grid table-striped table-hover">
+<div class="header-spacing"></div>
-			<thead>
+<th:block th:if="${messageInfo != null}">
-				<tr>
+    <script th:inline="javascript">
-					<th style="width: 60px;">社員ID</th>
+        alert([[${messageInfo.message}]]);
-					<th style="width: 100px;">社員名</th>
+    </script>
-					<th style="width: 150px;">フリガナ</th>
+</th:block>
-					<th style="width: 150px;">メールアドレス</th>
+<div class="header-spacing"></div>
-					<th style="width: 100px;">パスワード</th>
+<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
-					<th style="width: 70px;">管理者フラグ</th>
+    <!-- 検索結果が1件以上ある場合 -->
-					<th style="width: 150px;">所属部署</th>
+    <table class="table-grid table-striped table-hover">
-					<th style="width: 150px;">操作</th>
+        <thead>
-				</tr>
+        <tr>
-			</thead>
+            <th style="width: 60px;">社員ID</th>
-			<tbody>
+            <th style="width: 100px;">社員名</th>
-				<tr th:each="employeeInfoForm : ${employeeInfoFormList}">
+            <th style="width: 150px;">フリガナ</th>
-					<td th:text="${employeeInfoForm.idEmployee}"></td>
+            <th style="width: 150px;">メールアドレス</th>
-					<td th:text="${employeeInfoForm.nmEmployee}"></td>
+            <th style="width: 100px;">パスワード</th>
-					<td th:text="${employeeInfoForm.knEmployee}"></td>
+            <th style="width: 70px;">管理者フラグ</th>
-					<td th:text="${employeeInfoForm.mailAddress}"></td>
+            <th style="width: 150px;">所属部署</th>
-					<td th:text="${employeeInfoForm.password}"></td>
+            <th style="width: 150px;">操作</th>
-					<td th:text="${employeeInfoForm.adminAuth}"></td>
+        </tr>
-					<td th:text="${employeeInfoForm.nmDepartment}"></td>
+        </thead>
-					<td>
+        <tbody>
-						<!-- 更新フォーム -->
+        <tr th:each="employeeInfoForm : ${employeeInfoFormList}">
-						<form action="showUpdateEmployee" method="post" style="display: inline;">
+            <td th:text="${employeeInfoForm.idEmployee}"></td>
-							<input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
+            <td th:text="${employeeInfoForm.nmEmployee}"></td>
-							<input type="submit" value="更新">
+            <td th:text="${employeeInfoForm.knEmployee}"></td>
-						</form>
+            <td th:text="${employeeInfoForm.mailAddress}"></td>
-						<!-- 削除フォーム -->
+            <td th:text="${employeeInfoForm.password}"></td>
-						<form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
+            <td th:text="${employeeInfoForm.adminAuth}"></td>
-							style="display: inline;">
+            <td th:text="${employeeInfoForm.nmDepartment}"></td>
-							<input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
+            <td>
-							<input type="submit" value="削除">
+                <!-- 更新フォーム -->
-						</form>
+                <form action="showUpdateEmployee" method="post" style="display: inline;">
-					</td>
+                    <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
-				</tr>
+                    <input type="submit" value="更新">
-			</tbody>
+                </form>
-		</table>
+                <!-- 削除フォーム -->
-	</th:block>
+                <form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
-	<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
+                      style="display: inline;">
-		<!-- 検索結果が0件の場合 -->
+                    <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
-		検索結果はありません。
+                    <input type="submit" value="削除">
-	</th:block>
+                </form>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+</th:block>
+<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
+    <!-- 検索結果が0件の場合 -->
+    検索結果はありません。
+</th:block>
 
 </body>
-
 <script type="text/javascript">
 
-	function clearInput() {
+    function clearInput() {
-		document.getElementById('idDepartment').value = '';
+        document.getElementById('idEmployee').value = '';
-		document.getElementById('nmDepartment').value = '';
+        document.getElementById('nmEmployee').value = '';
-	}
+        document.getElementById('knEmployee').value = '';
+        document.getElementById('mailAddress').value = '';
+        document.getElementById('idDepartment').selectedIndex = 0;
+    }
 
 
 </script>
-
 </html>