3段階目終了

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

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

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

@@ -2,6 +2,7 @@ package com.example.rhizome.app.domain.service;
 
 import com.example.rhizome.app.domain.model.Department;
 
+
 public interface RegisterDepartment {
     void registerDepartment(Department department);
 }

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

@@ -1,17 +1,13 @@
-package com.example.rhizome.app.domain.service.impl;
+package com.example.rhizome.app.domain.service;
 
 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.service.RegisterDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
-/**
- * Department テーブルの登録系の機能を集約させるサービスクラスです。
- */
 @Service
 @Transactional
 public class RegisterDepartmentImpl implements RegisterDepartment {
@@ -23,12 +19,8 @@ public class RegisterDepartmentImpl implements RegisterDepartment {
 		this.departmentRepository = departmentRepository;
 	}
 	
-	/**
-	 * employee インスタンスの内容を登録する
-	 *
-	 * @param employee 登録対象のデータ
-	 */
 	public void registerDepartment(Department department) {
 		departmentRepository.save(DepartmentEntity.convertFrom(department));
 	}
+
 }

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

@@ -1,20 +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.Employee;
-import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
+import java.util.List;
+
 public interface SearchDepartment {
     List<Department> selectAll();
 
     List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
 
     List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
-    
-    LoginUser searchLoginUser(String mailAddress);
-
-    Employee searchEmployeeByIdEmployee(Integer idEmployee);
 }

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

@@ -0,0 +1,12 @@
+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;
+
+public interface SearchDepartmentInfo {
+	List<Department> selectAll();
+	
+	List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
+}

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

@@ -3,5 +3,6 @@ package com.example.rhizome.app.domain.service;
 import com.example.rhizome.app.domain.model.Department;
 
 public interface UpdateDepartment {
-	void updateDepartment(Department department);
+	void updateDepartment(Department beforeDepartment, Department updateDepertment);
+
 }

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

@@ -7,26 +7,20 @@ 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 DeleteDepartmentImpl implements DeleteDepartment {
 
 	DepartmentRepository departmentRepository;
-
 	@Autowired
 	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
 		this.departmentRepository = departmentRepository;
 	}
 	
-	/**
+	
-	 * idDepartment を元に department データを削除
-	 *
-	 * @param idDepartment 削除対象のidDepartmnet
-	 */
 	public void deleteDepartment(Integer idDepartment) {
 		departmentRepository.deleteById(idDepartment);
+
 	}
+
 }

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

@@ -1,26 +1,25 @@
 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;
+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 com.example.rhizome.app.domain.model.Department;
+import java.util.List;
-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;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 /**
- * Department テーブル検索系の機能を集約させるサービスクラスです。
+ * 部署情報検索系の機能を集約させるサービスクラスです。
  */
 @Service
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
+
     DepartmentRepository departmentRepository;
 
     /**
@@ -54,10 +53,10 @@ public class SearchDepartmentImpl implements SearchDepartment {
         return DepartmentEntity
                 .createDepartmentList(
                         departmentRepository.findAll(Specification
-								.where(DepartmentRepository
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
-								.and(DepartmentRepository
+                        )
-										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
+                );
 
     }
 
@@ -74,23 +73,10 @@ public class SearchDepartmentImpl implements SearchDepartment {
         return DepartmentEntity
                 .createDepartmentList(
                         departmentRepository.findAll(Specification
-								.where(DepartmentRepository
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
-								.and(DepartmentRepository
+                        )
-										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
+                );
 
     }
-
-	@Override
-	public LoginUser searchLoginUser(String mailAddress) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
-	@Override
-	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
 }

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

@@ -5,12 +5,14 @@ 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.service.UpdateDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 @Service
 @Transactional
-public class UpdateDepartmentImpl {
+public class UpdateDepartmentImpl implements UpdateDepartment {
+
 	DepartmentRepository departmentRepository;
 	
 	@Autowired
@@ -18,9 +20,13 @@ public class UpdateDepartmentImpl {
 		this.departmentRepository = departmentRepository;
 	}
 	
-	public void updateDepartment(Department department) {
+	public void updateDepartment(Department beforeDepartment, Department updateDepertment) {
-		// ★考える：Model を Entity に変換（DepartmentEntity.convertFrom）して、Repository の save に渡す
+		departmentRepository.save(DepartmentEntity.convertFrom(mergeDepartment(beforeDepartment,updateDepertment)));
-		departmentRepository.save(DepartmentEntity.convertFrom(department));
+
+	}
+	
+	private Department mergeDepartment(Department beforeDepartment, Department updateDepartment) {
+		return new Department(updateDepartment.getIdDepartment(),updateDepartment.getNmDepartment());
 	}
 
 }

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

@@ -1,5 +1,7 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -12,109 +14,114 @@ 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.EmployeeInfo;
+import com.example.rhizome.app.domain.model.LoginUser;
+import com.example.rhizome.app.domain.model.SearchConditionEmployee;
 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.domain.service.SearchEmployeeInfo;
 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.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
 
-/**
- * 削除処理のコントロータ
- */
 @Controller
 public class DeleteDepartmentController {
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(DeleteEmployeeController.class.getName());
 
-	// エラーメッセージ用の定数フィールド
+	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	HttpSession httpSession;
+	private final HttpSession httpSession;
-	DeleteDepartment deleteDepartment;
+	private final DeleteDepartment deleteDepartment;
-	SearchDepartment searchDepartment;
+	private final SearchDepartment searchDepartment;
-	SearchEmployee searchEmployee; // 所属社員の確認に使う（既存）
+	private final SearchEmployeeInfo searchEmployeeInfo;
 
 	@Autowired
 	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
-			HttpSession httpSession, SearchEmployee searchEmployee) {
+			SearchEmployeeInfo searchEmployeeInfo, HttpSession httpSession) {
 		this.httpSession = httpSession;
 		this.deleteDepartment = deleteDepartment;
 		this.searchDepartment = searchDepartment;
-		this.searchEmployee = searchEmployee;
+		this.searchEmployeeInfo = searchEmployeeInfo;
 	}
 
-	/**
+	@PermissionCheck
-	 * 削除処理のコントローラ
+	@SessionCheck
-	 *
+	@RequestMapping(value = "/deleteDepartment", method = RequestMethod.POST)
-	 * @param idDepartment 削除対象のdepartmentId
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-
-	@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が不明です。";
-
 		try {
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			// 削除対象の部署IDが存在しない場合
-			// 作成した部署一覧をセット
+			if (idDepartment == null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm("削除対象のIDが不明です。"));
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+						DepartmentForm.convertFrom(searchDepartment.selectAll()));
+				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+			}
+
+			// ログインユーザー情報を取得
+			LoginUser loginUser = LoginUserForm
+					.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER));
+
+			// 削除バリデーションと削除の実行
+			deleteExec(model, idDepartment, loginUser);
+
+			// 最新の部署一覧を再取得してセット
 			model.addAttribute(
 					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
 					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 			
-			if (idDepartment == null
+			model.addAttribute("searchConditionDepartmentForm", new SearchConditionDepartmentForm());
-					|| searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) == null) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
-			}
 
-			// 削除処理実施
+			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-			deleteExec(model, idDepartment);
-
-			// 検索画面に遷移
-			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
 
 		} catch (Exception e) {
-			// ログイン情報の破棄
 			httpSession.invalidate();
 			e.printStackTrace();
-			// エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 	}
 
-	/**
+	private boolean deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
-	 * 削除処理実施
+		final String DELETE_TARGET_ID_CAN_NOT_DELETE = "ログイン者自身は削除出来ません。";
-	 *
+		final String BELONG_EMPLOYEE_EXIST_ERROR = "1名以上が所属している部署は削除出来ません。";
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @param idEmployee 削除対象のDepartmentId
-	 */
-	private void deleteExec(Model model, Integer idDepartment) {
-
-		final String DELETE_DPARTMENT_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除出来ません。";
 		final String DELETE_COMPLETE = "削除しました。";
 
-		// 削除対象部署が1名以上所属しているかチェック
+		// ログイン者自身の部署削除ブロック
-		if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
+		if (loginUser != null && Objects.equals(loginUser.getIdDepartment(), idDepartment)) {
-			// 削除対象だった場合
-			// エラーメッセージをセット
 			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-					new MessageForm(DELETE_DPARTMENT_TARGET_ID_CAN_NOT_DELETE));
+					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
-			// 検索画面に遷移
+			return false;
-			return;
 		}
 
-		// 削除を実施
+		SearchConditionEmployee searchCondition = new SearchConditionEmployee(
+				null,
+				null,
+				null,
+				null,
+				idDepartment);
+
+		// 社員検索サービスを呼び出す
+		List<EmployeeInfo> employeeList = searchEmployeeInfo.searchBy(searchCondition);
+
+		// 1件以上レコードが返ってきた（所属社員がいた）場合は削除を中断
+		if (employeeList != null && !employeeList.isEmpty()) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(BELONG_EMPLOYEE_EXIST_ERROR));
+			return false;
+		}
+
+		// すべてのバリデーションチェックを通過したら削除を実施
 		deleteDepartment.deleteDepartment(idDepartment);
 
-		// 削除完了したメッセージをセット
+		// 削除完了メッセージをセット（画面側のアラートボックスと連動）
 		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
-
+		return true;
 	}
 }

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

@@ -1,21 +1,6 @@
 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;
-
-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.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;
@@ -27,9 +12,22 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpSession;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DELETE_EMPLOYEE;
 
 /**
- * 削除処理のコントローラ
+ * 削除処理のコントロータ
  */
 @Controller
 public class DeleteEmployeeController {

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

@@ -1,8 +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;
@@ -16,10 +13,10 @@ 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.RegisterDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.impl.RegisterDepartmentImpl;
-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;
@@ -29,19 +26,16 @@ import com.example.rhizome.app.presentation.form.MessageForm;
 @Controller
 public class InsertDepartmentController {
 
-	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
-	private final static Logger LOGGER = Logger.getLogger(InsertEmployeeController.class.getName());
-
-	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	HttpSession httpSession;
+	private final HttpSession httpSession;
-	RegisterDepartment registerDepartment;
+	private final RegisterDepartment registerDepartment;
-	SearchDepartment searchDepartment;
+	private final SearchDepartment searchDepartment;
 
 	@Autowired
-	public InsertDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
+	public InsertDepartmentController(HttpSession httpSession, RegisterDepartment registerDepartment,
-			SearchDepartmentImpl searchDepartment) {
+			SearchDepartment searchDepartment) {
 		this.httpSession = httpSession;
 		this.registerDepartment = registerDepartment;
 		this.searchDepartment = searchDepartment;
@@ -52,74 +46,50 @@ public class InsertDepartmentController {
 		return new InsertDepartmentForm();
 	}
 
-	@RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
+	@PermissionCheck
-	public String insertDepartment(InsertDepartmentForm insertDepartmentForm, Model model) {
+	@SessionCheck
-		try {
+	@RequestMapping(value = "/insertDepartmentInput", method = RequestMethod.POST)
-			model.addAttribute(
+	public String showInsertInput(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm) {
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(
-							searchDepartment.selectAll()));
-			List<String> error2 = validateParameter2(
-					insertDepartmentForm.getIdDepartment(),
-					insertDepartmentForm.getNmDepartment());
-
-			// エラーが1件以上有る場合
-			if (!error2.isEmpty()) {
-				// エラー内容を画面に表示
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(String.join(", ", error2) + "が不正です。"));
-				// 登録画面に遷移
 		return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
 	}
 
-			// 登録処理
+	@PermissionCheck
-			registerDepartment.registerDepartment(InsertDepartmentForm.convertToo(insertDepartmentForm));
+	@SessionCheck
-			// 登録結果画面に遷移
+	@RequestMapping(value = "/insertDepartmentConfirm", method = RequestMethod.POST)
+	public String confirmDepartment(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm,
+			Model model) {
+
+		List<String> error = insertDepartmentForm.validateParameter();
+
+		if (!error.isEmpty()) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(String.join(", ", error) + "が不正です。"));
+			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
+		}
+
+		return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_CONFIRM_HTML;
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/insertDepartment", method = RequestMethod.POST)
+	public String insertDepartment(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm,
+			Model model) {
+		try {
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+
+			registerDepartment.registerDepartment(InsertDepartmentForm.convertTo(insertDepartmentForm));
+
 			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_RESULT_HTML;
 
 		} catch (Exception e) {
-			// ログイン情報の破棄
 			httpSession.invalidate();
-
 			e.printStackTrace();
 
-			// エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 	}
-
-	private List<String> validateParameter2(
-
-			Integer departmentId,
-			String departmentNm) {
-
-		final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
-		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
-
-		List<String> error2 = new ArrayList<>();
-
-		// null or 空文字判定
-		if (departmentId == null) {
-			// エラー内容を追加
-			error2.add(DEPARTMENT_ID_NULL_BLANK);
-		}
-
-		// null or 空文字判定
-		if (isNullOrBlank(departmentNm)) {
-			// エラー内容を追加
-			error2.add(DEPARTMENT_NAME_NULL_BLANK);
-		}
-		
-		return error2;
-	}
-
-	private static boolean isNullOrBlank(String str) {
-		if (null == str) {
-			return true;
-		}
-
-		return str.isBlank();
-	}
 }

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

@@ -1,5 +1,21 @@
 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;
@@ -11,20 +27,6 @@ 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;
 
 /**
  * 新規登録用のコントローラ
@@ -43,7 +45,8 @@ public class InsertEmployeeController {
 	SearchDepartment searchDepartment;
 
 	@Autowired
-    public InsertEmployeeController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee, SearchDepartmentImpl searchDepartment) {
+	public InsertEmployeeController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee,
+			SearchDepartmentImpl searchDepartment) {
 		this.httpSession = httpSession;
 		this.registerEmployee = registerEmployee;
 		this.searchDepartment = searchDepartment;
@@ -72,8 +75,7 @@ public class InsertEmployeeController {
 			model.addAttribute(
 					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
 					DepartmentForm.convertFrom(
-                            searchDepartment.selectAll()
+							searchDepartment.selectAll()));
-                    ));
 
 			// Confirm画面から渡ってきた値をチェック
 			List<String> error = validateParameter(
@@ -82,13 +84,13 @@ public class InsertEmployeeController {
 					insertEmployeeForm.getMailAddress(),
 					insertEmployeeForm.getPassword(),
 					insertEmployeeForm.getAdminAuth(),
-                    insertEmployeeForm.getIdDepartment()
+					insertEmployeeForm.getIdDepartment());
-            );
 
 			// エラーが1件以上有る場合
 			if (!error.isEmpty()) {
 				// エラー内容を画面に表示
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(String.join(", ", error) + "が不正です。"));
 				// 登録画面に遷移
 				return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
 			}
@@ -126,8 +128,7 @@ public class InsertEmployeeController {
 			String mailAddress,
 			String password,
 			Integer management,
-            Integer departmentId
+			Integer departmentId) {
-    ) {
 
 		final String EMPLOYEE_NAME_NULL_BLANK = "社員名";
 		final String EMPLOYEE_KANA_NULL_BLANK = "社員名フリガナ";
@@ -193,6 +194,3 @@ public class InsertEmployeeController {
 	}
 
 }
-
-
-

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

@@ -1,123 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-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;
-
-@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;
-
-	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-	}
-
-	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartmentForm();
-	}
-
-	/**
-	 * 部署検索画面表示処理コントローラ
-	 *
-	 * @param searchConditionEmployeeForm 検索画面のフォーム
-	 * @param model                       ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-
-		try {
-
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
-					searchDepartment.searchBy(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
-			//部分一致検索
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(
-							searchDepartment.searchByWithLike(
-									SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
-
-			// 検索ページに遷移
-			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_FORM_EMPTY, method = RequestMethod.POST)
-	public String select(Model model) {
-
-		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-		// 作成した部署一覧をセット
-		model.addAttribute(
-				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-		// 検索条件を元に検索を実施
-		//		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-		//				DepartmentForm.convertFrom(
-		//						searchDepartment.searchBy(
-		//								SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()))));
-
-		//部分一致検索
-		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentForm.convertFrom(
-						searchDepartment.searchByWithLike(
-								SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()))));
-		// 検索ページに遷移
-		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-	}
-
-}

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

@@ -0,0 +1,81 @@
+package com.example.rhizome.app.presentation.controller;
+
+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.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+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.SearchConditionDepartmentForm;
+
+@Controller
+public class SelectDepatmentController {
+	
+	// ログ出力用インスタンス
+    private final static Logger LOGGER = Logger.getLogger(SelectDepatmentController.class.getName());
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    HttpSession httpSession;
+    SearchDepartment searchDepartment;
+    
+    @Autowired
+    public SelectDepatmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
+    	this.httpSession = httpSession;
+    	this.searchDepartment = searchDepartment;
+    }
+    
+    @ModelAttribute
+    public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+    	return new SearchConditionDepartmentForm();
+    }
+    
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = "/selectDepartment", method = RequestMethod.POST)
+    public String select(@ModelAttribute("searchConditionDepartmentForm") SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+    	
+    	try {
+           
+            SearchConditionDepartment searchCondition = SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm);
+
+            
+            List<Department> departmentList = searchDepartment.searchBy(searchCondition);
+
+            
+            model.addAttribute(
+                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+                    DepartmentForm.convertFrom(departmentList)
+            );
+
+            
+            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+
+        } catch (Exception e) { 
+            // ログイン情報の破棄
+            httpSession.invalidate();
+
+            e.printStackTrace();
+
+            // エラーログ出力
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            // エラー画面遷移
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
+        }
+    } 
+} 

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

@@ -9,77 +9,74 @@ 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 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.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.RegisterDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.impl.RegisterDepartmentImpl;
-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.MessageForm;
-import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentInfoForm;
 
 @Controller
 public class UpdateDepartmentController {
 
 	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
+	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
 	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	HttpSession httpSession;
+	private final HttpSession httpSession;
-	RegisterDepartment registerDepartment;
+	private final SearchDepartment searchDepartment;
-	SearchDepartment searchDepartment;
 
 	@Autowired
-	public UpdateDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
+	public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
-			SearchDepartmentImpl searchDepartment) {
 		this.httpSession = httpSession;
-		this.registerDepartment = registerDepartment;
 		this.searchDepartment = searchDepartment;
+
 	}
 
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DEPARTMENT, method = RequestMethod.POST)
+	@ModelAttribute
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+		return new SearchConditionDepartmentForm();
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/showUpdateDepartment", method = RequestMethod.POST)
 	public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
 		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
+
 		try {
-			// ★① searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) で対象を検索
+
-			// ★② 結果が空なら MESSAGE_ERROR を載せて "forward:" + SELECT_DEPARTMENT_FORM_EMPTY
+			List<Department> departmentInfoList = searchDepartment.searchBy(
-			// ★③ あれば UpdateDepartmentForm.convertFrom(結果の先頭) を
-			//     UPDATE_DEPARTMENT_FORM という名前で model に載せ、UPDATE_DEPARTMENT_INPUT_HTML を返す
-			List<Department> DepartmentList = searchDepartment.searchBy(
 					new SearchConditionDepartment(idDepartment, null));
 
-			// DBに更新対象のデータがあるか
+			if (departmentInfoList == null || departmentInfoList.isEmpty()) {
-			if (DepartmentList.isEmpty()) {
-				// ない場合はエラーメッセージをセットして検索画面に戻る
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
 						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
-				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
-			}
-			// 更新画面に遷移
-			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM,
-					UpdateDepartmentForm.convertFrom(DepartmentList.get(0)));
 
-			// Update画面に遷移
+				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
+			}
+
+			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM,
+					UpdateDepartmentInfoForm.convertForm(departmentInfoList.get(0)));
+
 			return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
 
 		} catch (Exception e) {
-			// ログイン情報の破棄
 			httpSession.invalidate();
-
 			e.printStackTrace();
-
-			// エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+	}
 
 }
-	}
-}

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

@@ -1,5 +1,7 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -12,25 +14,29 @@ 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.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.UpdateDepartment;
 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.MessageForm;
-import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentInfoForm;
 
 @Controller
 public class UpdateDepartmentResultController {
 
 	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
+	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
 	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	HttpSession httpSession;
+	private final HttpSession httpSession;
-	SearchDepartment searchDepartment;
+	private final SearchDepartment searchDepartment;
-	UpdateDepartment updateDepartment;
+	private final UpdateDepartment updateDepartment;
 
 	@Autowired
 	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
@@ -40,8 +46,17 @@ public class UpdateDepartmentResultController {
 		this.updateDepartment = updateDepartment;
 	}
 
-	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
+	@ModelAttribute
-	public String departmentUpdateResult(@ModelAttribute UpdateDepartmentForm updateDepartmentForm, Model model) {
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+		return new SearchConditionDepartmentForm();
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/updateDepartmentResult", method = RequestMethod.POST)
+	public String departmentUpdateResult(
+			@ModelAttribute("updateDepartmentInfoForm") UpdateDepartmentInfoForm updateDepartmentInfoForm,
+			Model model) {
 
 		final String NOTHING = "項目が空欄です。";
 		final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
@@ -50,47 +65,51 @@ public class UpdateDepartmentResultController {
 
 		try {
 
-			// 部署一覧取得
+			// 必須入力チェック
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+			if (UpdateDepartmentInfoForm.hasErrorParameter(updateDepartmentInfoForm)) {
-			
-            
-           updateDepartmentForm.hasRequiredValue();
-           
-			if(updateDepartmentForm.hasRequiredValue() == false) {
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
 				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
 			}
 
-			if(searchDepartment.searchBy(null) != null){
+			List<Department> beforeList = searchDepartment.searchBy(
-				// 存在する場合はエラーメッセージを設定して更新入力画面に遷移
+					new SearchConditionDepartment(updateDepartmentInfoForm.getIdDepartment(), null));
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
 
-			
+			if (beforeList == null || beforeList.isEmpty()) {
-			if(searchDepartment.searchBy(null) != null) {
 				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
+				return "forward:/selectDepartment";
+			}
+			Department beforeDepartment = beforeList.get(0);
+			Department updateDepartmentData = UpdateDepartmentInfoForm.convertTo(updateDepartmentInfoForm);
+
+			if (Objects.equals(beforeDepartment.getNmDepartment(), updateDepartmentData.getNmDepartment())) {
+
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
 				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
 			}
 
-			 // 更新結果のメッセージを画面にセットし一覧画面に遷移
+			List<Department> duplicationList = searchDepartment.searchBy(
+					new SearchConditionDepartment(null, updateDepartmentData.getNmDepartment()));
+
+			if (duplicationList != null && !duplicationList.isEmpty()) {
+
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM, updateDepartmentInfoForm);
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+
+			}
+
+			// 更新を実行 ➔ forward
+			updateDepartment.updateDepartment(beforeDepartment, updateDepartmentData);
+
 			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
+			return "forward:/selectDepartment";
 
-            // forward 先で不用意な動作をしないために UpdateEmployeeInfoForm をクリア
+		} catch (
-            return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
 
-		} catch (Exception e) {
+		Exception e) {
-			// 他と同じ
-			// ログイン情報の破棄
 			httpSession.invalidate();
-
 			e.printStackTrace();
-			// エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 	}

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

@@ -9,11 +9,12 @@ public class PageReturnAttributeKeyword {
     public static final String MESSAGE_INFO = "messageInfo";
 
     public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
-    public static final String UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
     public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
+    public static final String UPDATE_DEPARTMENT_INFO_FORM = "updateDepartmentInfoForm";
     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 UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
 
 }

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

@@ -17,10 +17,15 @@ public class TransitionTargetPageNameKeyword {
     // 管理者向け
     public static final String MENU_HTML = "menu";
     public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
+    public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
     public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
+    public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
     public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
+    public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
     public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
+    public static final String INSERT_DEPARTMENT_RESULT_HTML = "insertDepartmentResult";
     public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
+    public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
 
     public static final String ERROR_HTML = "error";
 
@@ -46,20 +51,18 @@ public class TransitionTargetPageNameKeyword {
     public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
     // Department
-	// HTML
+    public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+    public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
-	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
+    public static final String INSERT_DEPARTMENT_CONFIRM = "/insertDepartmentConfirm";
-	public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
+    public static final String INSERT_DEPARTMENT = "/insertDepartment";
-	public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
+    public static final String SELECT_DEPARTMENT_INFO = "/selectDepartment";
-	public static final String INSERT_DEPARTMENT_RESULT_HTML = "insertDepartmentResult";
-
-	// Controller
-	public static final String SELECT_DEPARTMENT = "/selectDepartment";
-	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectAll2";
     public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
     public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
-	public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
+    public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectDepartmentAll";
-	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
+   
+    
+    // HTML
+    // Controller
 
     /**
      * 管理者向けのページリストを返す
@@ -83,12 +86,16 @@ public class TransitionTargetPageNameKeyword {
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
                 UPDATE_EMPLOYEE_RESULT,
-				SELECT_DEPARTMENT,
-				SELECT_DEPARTMENT_FORM_EMPTY,
-				INSERT_DEPARTMENT_INPUT,
-				SHOW_UPDATE_DEPARTMENT,
-				SHOW_UPDATE_DEPARTMENT);
                 
+                DELETE_DEPARTMENT,
+                INSERT_DEPARTMENT_INPUT,
+                INSERT_DEPARTMENT,
+                INSERT_DEPARTMENT_CONFIRM,
+                SELECT_DEPARTMENT_INFO,
+                SELECT_DEPARTMENT_INFO_FORM_EMPTY,
+                SHOW_UPDATE_DEPARTMENT,
+                UPDATE_DEPARTMENT_RESULT
+        );
     }
 
     /**
@@ -103,7 +110,8 @@ public class TransitionTargetPageNameKeyword {
                 INDEX_LOGIN,
                 LOGOUT,
                 DO_LOGIN,
-				PERSONAL_UPDATE_RESULT);
+                PERSONAL_UPDATE_RESULT
+        );
     }
 
 }

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

@@ -1,5 +1,8 @@
 package com.example.rhizome.app.presentation.form;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.example.rhizome.app.domain.model.Department;
 
 import lombok.AllArgsConstructor;
@@ -10,15 +13,30 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class InsertDepartmentForm {
-	private String nmEmployee;
-
-	private Integer idDepartment;
 
 	private String nmDepartment;
 
-	public static Department convertToo(InsertDepartmentForm insertDepartmentForm) {
+	public static Department convertTo(InsertDepartmentForm insertDepartmentForm) {
 		return new Department(
-				insertDepartmentForm.getIdDepartment(),
+				null,
 				insertDepartmentForm.getNmDepartment());
 	}
+
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+
+		return str.isBlank();
+	}
+
+	public List<String> validateParameter() {
+		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
+
+		List<String> error = new ArrayList<>();
+		if (isNullOrBlank(nmDepartment)) {
+			error.add(DEPARTMENT_NAME_NULL_BLANK);
+		}
+		return error;
+	}
 }

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

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

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

@@ -1,32 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import com.example.rhizome.app.domain.model.Department;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UpdateDepartmentForm {
-	private Integer idDepartment;
-	private String nmDepartment;
-
-	/** Model(Department) → Form */
-	public static UpdateDepartmentForm convertFrom(Department department) {
-		return new UpdateDepartmentForm(department.getIdDepartment(), department.getNmDepartment());
-	}
-
-	/** Form → Model(Department) */
-	public static Department convertTo(UpdateDepartmentForm form) {
-		return new Department(form.getIdDepartment(), form.getNmDepartment());
-	}
-
-	/** 必須チェック。true：OK／false：部署ID か部署名が空 */
-	public boolean hasRequiredValue() {
-		// ★考える：idDepartment が null でなく、nmDepartment が null でも空白だけでもない
-		if(idDepartment != null && nmDepartment.isBlank() && nmDepartment.isEmpty());
-		return false;
-	}
-}

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

@@ -0,0 +1,48 @@
+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;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UpdateDepartmentInfoForm {
+
+	private Integer idDepartment;
+
+	private String nmDepartment;
+
+	public static UpdateDepartmentInfoForm convertForm(Department department) {
+		return new UpdateDepartmentInfoForm(
+				department.getIdDepartment(),
+				department.getNmDepartment());
+
+	}
+
+	public static List<UpdateDepartmentInfoForm> convertForm(List<Department> departmentList) {
+		return departmentList.stream().map(UpdateDepartmentInfoForm::convertForm).toList();
+	}
+
+	public static Department convertTo(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+		return new Department(
+				updateDepartmentInfoForm.getIdDepartment(),
+				updateDepartmentInfoForm.getNmDepartment());
+	}
+
+	public static boolean hasErrorParameter(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+
+		return isNullOrBlank(updateDepartmentInfoForm.getNmDepartment());
+	}
+
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+		return str.isBlank();
+	}
+}

src/main/resources/templates/insertDepartmentConfilm.html

@@ -0,0 +1,73 @@
+<!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="/insertDepartment" id="insertForm" method="post" th:object="${insertDepartmentForm}">
+
+		<div class="msgBox error" th:if="${messageError != null}">
+			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
+		</div>
+		<table>
+			<tr>
+				<th class="header">部署ID</th>
+				<td>
+					<label>
+						<input class="readOnly" name="idDepartment" readonly="readonly" type="text" value="自動で設定されます" />
+					</label>
+				</td>
+			</tr>
+			<tr>
+				<th class="header">部署名</th>
+				<td>
+					<label>
+						<input class="readOnly" th:field="*{nmDepartment}" readonly="readonly" type="text" />
+					</label>
+				</td>
+			</tr>
+			<tr>
+				<td class="btnArea" colspan="2">
+					<input type="submit" value="登録" />
+				</td>
+			</tr>
+		</table>
+		<a href="javascript:onClickEdit()">登録内容の編集</a>　|　<a href="showMenu">メニューに戻る</a>
+	</form>
+	<script type="text/javascript">
+		function onClickEdit() {
+			const form = document.getElementById('insertForm');
+			form.setAttribute('method', 'post');
+			form.setAttribute('action', '/insertDepartmentInput');
+
+			// 確認画面から編集画面に戻ってきたときのフラグ（未使用）
+			const inputField = document.createElement("input");
+			inputField.setAttribute("type", "hidden");
+			inputField.setAttribute("name", "backFlg");
+			inputField.setAttribute("value", "edit");
+
+			form.appendChild(inputField);
+
+			// フォームをDOMに追加
+			document.body.appendChild(form);
+
+			form.submit();
+		}
+	</script>
+</body>
+
+</html>

src/main/resources/templates/insertDepartmentConfirm.html

@@ -1,18 +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>
-	<!-- CSSの読み込み -->
-	<link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>登録内容確認</title>
-</head>
-
-<body>
-
-</body>
-
-</html>

src/main/resources/templates/insertDepartmentInput.html

@@ -19,7 +19,7 @@
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
 	</h1>
-	<form action="insertDepatmentConfirm" method="post" th:object="${insertDepartmentForm}">
+	<form action="/insertDepartmentConfirm" method="post" th:object="${insertDepartmentForm}">
 
 		<div class="msgBox error" th:if="${messageError} != null">
 			<span class="error" th:text="${messageError.message}"></span>
@@ -49,8 +49,8 @@
 				</td>
 			</tr>
 		</table>
-	</form>
 		<a href="showMenu">メニューに戻る</a>
+	</form>
 </body>
 
 </html>

src/main/resources/templates/insertDepartmentResult.html

@@ -1,18 +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>
-	<!-- CSSの読み込み -->
-	<link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>部署登録完了</title>
-</head>
-
-<body>
-
-</body>
-
-</html>

src/main/resources/templates/menu.html

@@ -26,22 +26,19 @@
         <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
         </td>
         <td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
-		</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: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:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
-			<td class="description">新規で部署追加を行います。</td>
+				<td class="description">新規で部署を追加します。</td>
+        
     </tr>
 
 </table>

src/main/resources/templates/selectDepartment.html

@@ -7,8 +7,8 @@
 	<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">
+	<link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">
-	<title>部署検索</title>
+	<title>検索</title>
 </head>
 
 <body>
@@ -28,13 +28,15 @@
 			<tr>
 				<th class="header">部署ID</th>
 				<td>
-					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
+
+					<input id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number" />
 				</td>
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
 				<td>
-					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+
+					<input id="nmDepartment" placeholder="部署名" th:field="*{nmDepartment}" type="text" />
 				</td>
 			</tr>
 			<tr>
@@ -42,7 +44,8 @@
 					<input type="submit" value="検索" />
 				</td>
 				<td class="btnArea" colspan="2">
-					<button onclick="clearInput()">クリア</button>
+
+					<button type="button" onclick="clearInput()">クリア</button>
 				</td>
 			</tr>
 		</table>
@@ -57,16 +60,16 @@
 			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: 150px;">部署ID</th>
+					<th style="width: 60px;">部署ID</th>
-					<th style="width: 280px;">部署名</th>
+					<th style="width: 100px;">部署名</th>
-					<th style="width: 500px;">操作</th>
+					<th style="width: 150px;">操作</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -75,7 +78,7 @@
 					<td th:text="${departmentForm.nmDepartment}"></td>
 					<td>
 						<!-- 更新フォーム -->
-						<form action="showUpdateDepartment" method="post" style="display: inline;">
+						<form action="/updateDepartmentResult" method="post" style="display: inline;">
 							<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
 							<input type="submit" value="更新">
 						</form>
@@ -85,25 +88,25 @@
 							<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').selectedIndex = 0;
+		document.getElementById('idDepartment').value = '';
 		document.getElementById('nmDepartment').value = '';
 	}
 
-
 </script>
 
 </html>

src/main/resources/templates/updateDepartmentInput.html

@@ -8,52 +8,70 @@
 	<!-- 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="updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
+	<form action="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-		th:object="${updateDepartmentForm}">
+		th:object="${updateDepartmentInfoForm}">
-
 		<div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:text="${messageError.message}"></span>
+			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
 		</div>
 		<table>
 			<tr>
 				<th class="header">部署ID</th>
 				<td>
+					<label>
 						<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
+					</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>
-				<td class="btnArea" colspan="2"><input type="submit" value="更新" /></td>
+				<td class="btnArea" colspan="2">
+					<input type="submit" value="更新" />
+				</td>
 			</tr>
 		</table>
 	</form>
-	<a href="javascript:selectDepartmentSubmit()">一覧に戻る</a>
+	<a href="javascript:selectSubmit()">一覧に戻る</a>
-	<script type="text/javascript">
+</body>
-		function selectDepartmentSubmit() {
+
+<script>
+	function selectSubmit() {
 		const form = document.createElement('form');
 		form.setAttribute('method', 'post');
 		form.setAttribute('action', 'selectDepartment');
+
+		// 動的送信用のHidden
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		const inputField = document.createElement("input");
+		inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("value", "selectAll");
+
+		form.appendChild(inputField);
+
+		// フォームをDOMに追加
 		document.body.appendChild(form);
+
 		form.submit();
 	}
+
 </script>
-</body>
 
 </html>