em-Springの課題です。

2026-10-14 16:39:39 +09:00
12 changed files with 219 additions and 305 deletions
--- a/src/main/java/com/example/rhizome/app/domain/model/Department.java
+++ b/src/main/java/com/example/rhizome/app/domain/model/Department.java
@@ -1,5 +1,7 @@
 package com.example.rhizome.app.domain.model;

+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;

@@ -17,5 +19,9 @@ public class Department {
     * 部署名
     */
    private final String nmDepartment;
+	public static Object convertFrom(List<Department> departmentList) {
+		// TODO 自動生成されたメソッド・スタブ
+		return departmentList;
+	}

 }
--- a/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java
@@ -2,24 +2,16 @@ package com.example.rhizome.app.domain.service;

 import java.util.List;

+import org.springframework.stereotype.Service;
+
 import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.Employee;
-import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;

+@Service
 public interface SearchDepartment {
+    List<Department> selectAll();

-	List<Department> searchDepartmentBynmDepartment(String nmDepartment);
-
-	List<Department> searchDepartmentByIdDepartment(Integer idDepartment);
-
-	// これはなにをしている？　SearchEmployeeより
-	LoginUser searchLoginUser(String mailAddress);
-
-	Employee searchEmployeeByIdEmployee(Integer idEmployee);
-
-	List<Department> selectAll();
-
-	List<Department> searchByWithLike(SearchConditionDepartment condition);
+    List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);

+    List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
 }
--- 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
@@ -9,8 +9,6 @@ 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.Employee;
-import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
@@ -82,28 +80,4 @@ public class SearchDepartmentImpl implements SearchDepartment {
                );

    }
-
-	@Override
-	public List<Department> searchDepartmentBynmDepartment(String nmDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	@Override
-	public List<Department> searchDepartmentByIdDepartment(Integer idDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	@Override
-	public LoginUser searchLoginUser(String mailAddress) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	@Override
-	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
 }
--- a/src/main/java/com/example/rhizome/app/infra/entity/EmployeeDepartmentEntity.java
+++ b/src/main/java/com/example/rhizome/app/infra/entity/EmployeeDepartmentEntity.java
@@ -1,16 +1,27 @@
 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.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
@@ -114,5 +125,15 @@ public class EmployeeDepartmentEntity {

    }

+	public static List<Department> createDepartmentInfoList(List<EmployeeDepartmentEntity> all) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	public static List<Department> createDepartmentList(List<EmployeeDepartmentEntity> all) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+

 }
--- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java
@@ -1,132 +1,133 @@
-//package com.example.rhizome.app.presentation.controller;
-//
-//import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-//
-//import java.util.List;
-//import java.util.logging.Level;
-//import java.util.logging.Logger;
-//
-//import javax.servlet.http.HttpSession;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.ModelAttribute;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//
-//import com.example.rhizome.aop.aspect.PermissionCheck;
-//import com.example.rhizome.aop.aspect.SessionCheck;
-//import com.example.rhizome.app.domain.model.Employee;
-//import com.example.rhizome.app.domain.service.SearchDepartment;
-//import com.example.rhizome.app.domain.service.SearchEmployee;
-//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.InsertEmployeeForm;
-//import com.example.rhizome.app.presentation.form.MessageForm;
-//
-///**
-// * 新規登録者情報チェック用のコントローラ
-// */
-//@Controller
-//public class InsertEmployeeConfirmController {
-//
-//    // ログ出力用インスタンス
-//    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
-//
-//    // エラーメッセージ用の定数フィールド
-//    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-//
-//    HttpSession httpSession;
-//    SearchDepartment searchDepartment;
-//    SearchEmployee searchEmployee;
-//
-//    @Autowired
-//    public InsertEmployeeConfirmController(
-//            HttpSession httpSession,
-//            SearchDepartmentImpl searchDepartment,
-//            SearchEmployeeImpl searchEmployee
-//    ) {
-//        this.httpSession = httpSession;
-//        this.searchDepartment = searchDepartment;
-//        this.searchEmployee = searchEmployee;
-//    }
-//
-//    @ModelAttribute
-//    public InsertEmployeeForm insertEmployeeForm() {
-//        return new InsertEmployeeForm();
-//    }
-//
-//    /**
-//     * 登録情報のチェックを行う
-//     *
-//     * @param insertEmployeeForm 登録情報
-//     * @param model              ビューにデータを渡すためのコンテナ
-//     * @return 遷移先の画面
-//     */
-//    @PermissionCheck
-//    @SessionCheck
-//    @RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
-//    public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) {
-//
-//        try {
-//            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
-//            // 作成した部署一覧をセット
-//            model.addAttribute(
-//                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-//                    DepartmentForm.convertFrom(
-//                            searchDepartment.selectAll()
-//                    ));
-//
-//            // 登録用パラメータチェック
-//            List<String> error = insertEmployeeForm.validateParameter();
-//
-//            // 入力内容に誤りがあるか
-//            if (!error.isEmpty()) {
-//                // 誤りがあった場合
-//                // 誤りがあった箇所のエラーメッセージを表示
-//                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
-//                // 画面に返す為の登録情報をセット
-//                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-//                // 登録画面に遷移
-//                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-//            }
-//
-//            final String DUPLICATION = "既に登録済みのメールアドレスです。";
-//
-//            // 登録対象のメールアドレスを元に検索
-//            List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress());
-//
-//            // 検索結果があるか
-//            if (!employeeList.isEmpty()) {
-//                // 検索した結果0件ではない場合
-//                // 重複を許さないため、エラー処理
-//                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-//                // 画面に返す為の登録情報をセット
-//                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-//                // 登録画面に遷移
-//                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-//            }
-//
-//            // 登録確認ページに遷移
-//            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-//            // 登録確認画面に遷移
-//            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
-//
-//
-//        } catch (Exception e) {
-//            // ログイン情報の破棄
-//            httpSession.invalidate();
-//
-//            e.printStackTrace();
-//
-//            // エラーログ出力
-//            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-//            // エラー画面遷移
-//            return TransitionTargetPageNameKeyword.ERROR_HTML;
-//        }
-//    }
-//}
+package com.example.rhizome.app.presentation.controller;
+
+import com.example.rhizome.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.Employee;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.SearchEmployee;
+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.InsertEmployeeForm;
+import com.example.rhizome.app.presentation.form.MessageForm;
+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.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM;
+
+/**
+ * 新規登録者情報チェック用のコントローラ
+ */
+@Controller
+public class InsertEmployeeConfirmController {
+
+    // ログ出力用インスタンス
+    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
+
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    HttpSession httpSession;
+    SearchDepartment searchDepartment;
+    SearchEmployee searchEmployee;
+
+    @Autowired
+    public InsertEmployeeConfirmController(
+            HttpSession httpSession,
+            SearchDepartmentImpl searchDepartment,
+            SearchEmployeeImpl searchEmployee
+    ) {
+        this.httpSession = httpSession;
+        this.searchDepartment = searchDepartment;
+        this.searchEmployee = searchEmployee;
+    }
+
+    @ModelAttribute
+    public InsertEmployeeForm insertEmployeeForm() {
+        return new InsertEmployeeForm();
+    }
+
+    /**
+     * 登録情報のチェックを行う
+     *
+     * @param insertEmployeeForm 登録情報
+     * @param model              ビューにデータを渡すためのコンテナ
+     * @return 遷移先の画面
+     */
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
+    public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) {
+
+        try {
+            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+            // 作成した部署一覧をセット
+            model.addAttribute(
+                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+                    DepartmentForm.convertFrom(
+                            searchDepartment.selectAll()
+                    ));
+
+            // 登録用パラメータチェック
+            List<String> error = insertEmployeeForm.validateParameter();
+
+            // 入力内容に誤りがあるか
+            if (!error.isEmpty()) {
+                // 誤りがあった場合
+                // 誤りがあった箇所のエラーメッセージを表示
+                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
+                // 画面に返す為の登録情報をセット
+                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+                // 登録画面に遷移
+                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
+            }
+
+            final String DUPLICATION = "既に登録済みのメールアドレスです。";
+
+            // 登録対象のメールアドレスを元に検索
+            List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress());
+
+            // 検索結果があるか
+            if (!employeeList.isEmpty()) {
+                // 検索した結果0件ではない場合
+                // 重複を許さないため、エラー処理
+                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+                // 画面に返す為の登録情報をセット
+                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+                // 登録画面に遷移
+                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
+            }
+
+            // 登録確認ページに遷移
+            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+            // 登録確認画面に遷移
+            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
+
+
+        } catch (Exception e) {
+            // ログイン情報の破棄
+            httpSession.invalidate();
+
+            e.printStackTrace();
+
+            // エラーログ出力
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            // エラー画面遷移
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
+        }
+    }
+}
+
+
+
--- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java
@@ -1,21 +1,5 @@
 package com.example.rhizome.app.presentation.controller;

-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.RegisterEmployee;
@@ -27,6 +11,20 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
+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.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE;

 /**
 * 新規登録用のコントローラ
@@ -195,3 +193,6 @@ public class InsertEmployeeController {
    }

 }
+
+
+
--- a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java
@@ -14,7 +14,6 @@ public class PageReturnAttributeKeyword {
    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";
+	public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoList";

 }
--- 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
@@ -42,21 +42,25 @@ public class TransitionTargetPageNameKeyword {
    public static final String SHOW_MENU = "/showMenu";
    public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
    public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
+    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
    public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
    public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";

-	public static final String SELECT_DEPARTMENT_INFO = "/selectEmployeeInfo";
-	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectAll";
-
-	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";
+	
+	// TransitionTargetPageNameKeyword
+	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";   // HTML
+	public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";         // Controller
+	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
+
+	// PageReturnAttributeKeyword
+	public static final String UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";

    /**
     * 管理者向けのページリストを返す
@@ -79,7 +83,15 @@ public class TransitionTargetPageNameKeyword {
                SELECT_EMPLOYEE_INFO,
                SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT
+                UPDATE_EMPLOYEE_RESULT,
+                SELECT_DEPARTMENT_HTML,
+                SELECT_DEPARTMENT,
+                DELETE_DEPARTMENT,
+                SELECT_DEPARTMENT_FORM_EMPTY,
+                UPDATE_DEPARTMENT_INPUT_HTML,
+                SHOW_UPDATE_DEPARTMENT,
+                UPDATE_DEPARTMENT_RESULT,
+                UPDATE_DEPARTMENT_FORM
        );
    }

--- a/src/main/resources/templates/menu.html
+++ b/src/main/resources/templates/menu.html
@@ -32,19 +32,17 @@
        <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>
-		<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
-	</tr>
-	<tr>
-		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署登録 </a>
-		</td>
-		<td class="description">新規で部署追加を行います。</td>
-	</tr>

+	<tr>
+	    <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:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+	    <td class="description">新規で部署追加を行います。</td>
+	</tr>
 </table>
 </body>

--- a/src/main/resources/templates/selectDepartment.html
+++ b/src/main/resources/templates/selectDepartment.html
@@ -1,78 +0,0 @@
-<!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>
-	<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="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>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<!-- ★部署名の入力欄（type="text"）を作る -->
-				<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>
-			</tr>
-		</table>
-	</form>
-
-	<a href="showMenu">メニューに戻る</a>
-	<h1><span>検索結果</span></h1>
-
-	<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
-	<!-- departmentFormListから要素を順番に取り出す -->
-	<div th:if="${departmentFormList !=null and departmentFormList.size()> 0}">
-
-		<table>
-			<tr>
-<!--				<th>部署ID</th>-->
-				<th>部署名</th>
-			</tr>
-
-			<!-- 検索結果を1件ずつ取り出して表示 -->
-			<tr th:each="departmentForm : ${departmentFormList}">
-<!--				<td th:text="${departmentForm.idDepartment}"></td>-->
-				<td th:text="${departmentForm.nmDepartment}"></td>
-			</tr>
-		</table>
-
-	</div>
-
-</body>
-<script type="text/javascript">
-
-	<!--  ★部署名の入力欄も空にする（id は th:field が自動で作る） -->
-	function clearInput() {
-		document.getElementById('idDepartment').value = '';
-		document.getElementById('nmDepartment').value = '';
-	}
-</script>
-
-</html>
--- a/src/main/resources/templates/selectEmployee.html
+++ b/src/main/resources/templates/selectEmployee.html
@@ -91,7 +91,7 @@
 <div class="header-spacing"></div>
 <th:block th:if="${messageInfo != null}">
    <script th:inline="javascript">
-        alert([[${messageInfo.message}]]);
+        alert([[$,{messageInfo,message}]]);
    </script>
 </th:block>
 <div class="header-spacing"></div>
--- a/src/main/resources/templates/updateDepartmentInput.html
+++ b/src/main/resources/templates/updateDepartmentInput.html
@@ -1,12 +0,0 @@
-// 実装手順書より
-
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>Insert title here</title>
-</head>
-<body>
-
-</body>
-</html>