段階3です

.gitignore

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

.project

@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

.settings/org.eclipse.jdt.core.prefs

@@ -7,5 +7,5 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17

.settings/org.eclipse.wst.common.component

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="EM-Spring-0.0.1-SNAPSHOT">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <property name="context-root" value="EM-Spring"/>
+        <property name="java-output-path" value="/em-spring/target/classes"/>
+    </wb-module>
+</project-modules>

pom.xml

@@ -20,12 +20,6 @@
         <lombok.version>1.18.34</lombok.version>
     </properties>
     <dependencies>
-    	<dependency>
-	    	<groupId>org.projectlombok</groupId>
-    		<artifactId>lombok</artifactId>
-    		<version>1.18.30</version>
-    		<scope>provided</scope>
-		</dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>

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

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

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

@@ -1,7 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-import com.example.rhizome.app.domain.model.Department;
-
-public interface InsertDepartment {
-    void insert(Department department);
-}

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

@@ -3,6 +3,8 @@ 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;
 
 public interface SearchDepartment {
@@ -12,5 +14,7 @@ public interface SearchDepartment {
 
     List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
     
-	Department searchById(Integer idDepartment);
+    LoginUser searchLoginUser(String mailAddress);
+
+    Employee searchEmployeeByIdEmployee(Integer idEmployee);
 }

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

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

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

@@ -2,19 +2,31 @@ package com.example.rhizome.app.domain.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.example.rhizome.app.domain.service.DeleteDepartment;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
+/**
+ * Department レコード削除関連の機能を持つサービス
+ */
 @Service
+@Transactional
 public class DeleteDepartmentImpl implements DeleteDepartment {
 
-    @Autowired
-    private DepartmentRepository departmentRepository;
+	DepartmentRepository departmentRepository;
 
-    @Override
-    public void delete(Integer idDepartment) {
-        // JpaRepository တွင်ပါရှိသော deleteById ကို အသုံးပြု၍ ဖယ်ရှားရန်
+	@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/RegisterDepartmentImpl.java

@@ -5,25 +5,30 @@ 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.InsertDepartment;
+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 InsertDepartmentImpl implements InsertDepartment {
+public class RegisterDepartmentImpl implements RegisterDepartment {
 
 	DepartmentRepository departmentRepository;
 
 	@Autowired
-	public InsertDepartmentImpl(DepartmentRepository departmentRepository) {
+	public RegisterDepartmentImpl(DepartmentRepository departmentRepository) {
 		this.departmentRepository = departmentRepository;
 	}
 
-	@Override
-	public void insert(Department department) {
-		DepartmentEntity entity = new DepartmentEntity();
-		entity.setNmDepartment(department.getNmDepartment());
-		departmentRepository.save(entity);
+	/**
+	 * employee インスタンスの内容を登録する
+	 *
+	 * @param employee 登録対象のデータ
+	 */
+	public void registerDepartment(Department department) {
+		departmentRepository.save(DepartmentEntity.convertFrom(department));
 	}
 }

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

@@ -1,6 +1,5 @@
 package com.example.rhizome.app.domain.service.impl;
 
-
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,18 +8,19 @@ 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;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 /**
- * 部署情報検索系の機能を集約させるサービスクラスです。
+ * Department テーブル検索系の機能を集約させるサービスクラスです。
  */
 @Service
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
-
 	DepartmentRepository departmentRepository;
 
 	/**
@@ -54,10 +54,10 @@ public class SearchDepartmentImpl implements SearchDepartment {
 		return DepartmentEntity
 				.createDepartmentList(
 						departmentRepository.findAll(Specification
-                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
-                        )
-                );
+								.where(DepartmentRepository
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+								.and(DepartmentRepository
+										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
 
 	}
 
@@ -74,27 +74,23 @@ public class SearchDepartmentImpl implements SearchDepartment {
 		return DepartmentEntity
 				.createDepartmentList(
 						departmentRepository.findAll(Specification
-                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
-                        )
-                );
+								.where(DepartmentRepository
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+								.and(DepartmentRepository
+										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
 
 	}
 
 	@Override
-	public Department searchById(Integer idDepartment) {
+	public LoginUser searchLoginUser(String mailAddress) {
 		// TODO 自動生成されたメソッド・スタブ
-		if (idDepartment == null) {
 		return null;
 	}
 
-        return departmentRepository.findById(idDepartment)
-                .map(entity -> {
-                    List<Department> list = DepartmentEntity.createDepartmentList(List.of(entity));
-                    return list.isEmpty() ? null : list.get(0);
-                })
-                .orElse(null);
-    
+	@Override
+	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
 
 }
-}

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

@@ -2,25 +2,25 @@ package com.example.rhizome.app.domain.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.example.rhizome.app.domain.model.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
-public class UpdateDepartmentImpl implements UpdateDepartment {
+@Transactional
+public class UpdateDepartmentImpl {
+	DepartmentRepository departmentRepository;
 
 	@Autowired
-    private DepartmentRepository departmentRepository;
-
-    @Override
-    public void update(Department department) {
-        // Model မှ Entity သို့ ပြောင်းလဲခြင်း သို့မဟုတ် သက်ဆိုင်ရာ update ကို save ဖြင့် လုပ်ဆောင်ရန်
-        DepartmentEntity entity = new DepartmentEntity();
-        entity.setIdDepartment(department.getIdDepartment());
-        entity.setNmDepartment(department.getNmDepartment());
-        
-        departmentRepository.save(entity);
+	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
 	}
+
+	public void updateDepartment(Department department) {
+		// ★考える：Model を Entity に変換（DepartmentEntity.convertFrom）して、Repository の save に渡す
+		departmentRepository.save(DepartmentEntity.convertFrom(department));
+	}
+
 }

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

@@ -1,47 +1,120 @@
 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.PostMapping;
+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.SessionCheck;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 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.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 
+/**
+ * 削除処理のコントロータ
+ */
 @Controller
 public class DeleteDepartmentController {
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(DeleteEmployeeController.class.getName());
+
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
 	DeleteDepartment deleteDepartment;
+	SearchDepartment searchDepartment;
+	SearchEmployee searchEmployee; // 所属社員の確認に使う（既存）
 
 	@Autowired
-    public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment) {
+	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
+			HttpSession httpSession, SearchEmployee searchEmployee) {
 		this.httpSession = httpSession;
 		this.deleteDepartment = deleteDepartment;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployee = searchEmployee;
 	}
 
-    @SessionCheck
-    @PostMapping("/deleteDepartmentInput")
-    public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-        final String DELETE_COMPLETE = "削除しました。";
+	/**
+	 * 削除処理のコントローラ
+	 *
+	 * @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 {
-            // ဌာန ဖယ်ရှားခြင်း လုပ်ဆောင်ချက်
-            deleteDepartment.delete(idDepartment);
+			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			// 作成した部署一覧をセット
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
-            return "forward:/selectDepartment";
+			if (idDepartment == null
+					|| searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) == null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
+			}
+
+			// 削除処理実施
+			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;
 		}
 	}
+
+	/**
+	 * 削除処理実施
+	 *
+	 * @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()) {
+			// 削除対象だった場合
+			// エラーメッセージをセット
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(DELETE_DPARTMENT_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/DeleteEmployeeController.java

@@ -1,6 +1,21 @@
 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;
@@ -12,22 +27,9 @@ 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,5 +1,9 @@
 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;
 
@@ -9,70 +13,113 @@ 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;
 
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.service.InsertDepartment;
+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;
+import com.example.rhizome.app.presentation.form.InsertDepartmentForm;
 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;
-    InsertDepartment insertDepartment;
+	RegisterDepartment registerDepartment;
+	SearchDepartment searchDepartment;
 
 	@Autowired
-    public InsertDepartmentController(HttpSession httpSession, InsertDepartment insertDepartment) {
+	public InsertDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
+			SearchDepartmentImpl searchDepartment) {
 		this.httpSession = httpSession;
-        this.insertDepartment = insertDepartment;
+		this.registerDepartment = registerDepartment;
+		this.searchDepartment = searchDepartment;
 	}
 
-    /**
-     * 部署登録入力画面を表示する
-     */
-    @SessionCheck
-    @RequestMapping(value = "/insertDepartmentInput", method = {RequestMethod.GET, RequestMethod.POST})
-    public String showInsertDepartment(Model model) {
+	@ModelAttribute
+	public InsertDepartmentForm insertDepartmentForm() {
+		return new InsertDepartmentForm();
+	}
+
+	@RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
+	public String insertDepartment(InsertDepartmentForm insertDepartmentForm, Model model) {
 		try {
-            model.addAttribute("departmentForm", new DepartmentForm());
-            return "insertDepartmentInput";
+			model.addAttribute(
+					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;
+			}
+
+			// 登録処理
+			registerDepartment.registerDepartment(InsertDepartmentForm.convertToo(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;
 		}
 	}
 
-    /**
-     * 部署情報の登録を実行する
-     */
-    @SessionCheck
-    @PostMapping("/insertDepartmentResult")
-    public String insertDepartmentResult(@ModelAttribute("departmentForm") DepartmentForm departmentForm, Model model) {
-        final String INSERT_COMPLETE = "登録しました。";
+	private List<String> validateParameter2(
 
-        try {
-            Department department = new Department(null, departmentForm.getNmDepartment());
-            insertDepartment.insert(department);
+			Integer departmentId,
+			String departmentNm) {
 
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(INSERT_COMPLETE));
-            return "forward:/selectDepartment";
+		final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
+		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
 
-        } catch (Exception e) {
-            httpSession.invalidate();
-            e.printStackTrace();
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
+		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/SelectDepartmentController.java

@@ -1,41 +1,123 @@
 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.GetMapping;
 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;
 
+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.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
-    private SearchDepartment searchDepartment;
+	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
-    @GetMapping("/showSelectDepartment")
-    public String showSelectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm) {
-        return "selectDepartment";
+	@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;
 		}
 
-    /** 部署検索処理 */
-    @PostMapping("/selectDepartment")
-    public String selectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-        List<Department> departmentList = searchDepartment.searchByWithLike(
-                SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm)
-        );
+	}
 
-        model.addAttribute("departmentFormList", DepartmentForm.convertFrom(departmentList));
-        return "selectDepartment";
+	/**
+	 * 部署検索画面表示処理コントローラ
+	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
+	 *
+	 * @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/UpdateDepartmentController.java

@@ -1,5 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -8,82 +9,77 @@ 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.PostMapping;
 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.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.UpdateDepartment;
+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;
 import com.example.rhizome.app.presentation.form.MessageForm;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
 
 @Controller
 public class UpdateDepartmentController {
 
-    private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
+	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
+	RegisterDepartment registerDepartment;
 	SearchDepartment searchDepartment;
-    UpdateDepartment updateDepartment; // 追加
 
 	@Autowired
-    public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment, UpdateDepartment updateDepartment) {
+	public UpdateDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
+			SearchDepartmentImpl searchDepartment) {
 		this.httpSession = httpSession;
+		this.registerDepartment = registerDepartment;
 		this.searchDepartment = searchDepartment;
-        this.updateDepartment = updateDepartment; // 追加
 	}
 
-    @SessionCheck
-    @PostMapping("/updateDepartmentInput")
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DEPARTMENT, method = RequestMethod.POST)
 	public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
 		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
-
 		try {
-            Department department = searchDepartment.searchById(idDepartment);
+			// ★① searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) で対象を検索
+			// ★② 結果が空なら MESSAGE_ERROR を載せて "forward:" + SELECT_DEPARTMENT_FORM_EMPTY
+			// ★③ あれば UpdateDepartmentForm.convertFrom(結果の先頭) を
+			//     UPDATE_DEPARTMENT_FORM という名前で model に載せ、UPDATE_DEPARTMENT_INPUT_HTML を返す
+			List<Department> DepartmentList = searchDepartment.searchBy(
+					new SearchConditionDepartment(idDepartment, null));
 
-            if (department == null) {
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
-                return "forward:/selectDepartment";
+			// DBに更新対象のデータがあるか
+			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)));
 
-            model.addAttribute("departmentForm", DepartmentForm.convertFrom(department));
-            return "updateDepartmentInput";
+			// Update画面に遷移
+			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;
-        }
-    }
 
-    /**
-     * 部署情報の更新を実行する
-     */
-    @SessionCheck
-    @RequestMapping(value = "/updateDepartmentResult", method = RequestMethod.POST)
-    public String updateDepartmentResult(@ModelAttribute("departmentForm") DepartmentForm departmentForm, Model model) {
-        final String UPDATE_COMPLETE = "更新しました。";
-
-        try {
-            Department department = new Department(departmentForm.getIdDepartment(), departmentForm.getNmDepartment());
-            updateDepartment.update(department);
-
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
-            return "forward:/selectDepartment";
-
-        } 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

@@ -0,0 +1,97 @@
+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.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;
+
+@Controller
+public class UpdateDepartmentResultController {
+
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	SearchDepartment searchDepartment;
+	UpdateDepartment updateDepartment;
+
+	@Autowired
+	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
+			UpdateDepartment updateDepartment) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+		this.updateDepartment = updateDepartment;
+	}
+
+	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
+	public String departmentUpdateResult(@ModelAttribute UpdateDepartmentForm updateDepartmentForm, Model model) {
+
+		final String NOTHING = "項目が空欄です。";
+		final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
+		final String NO_TARGET = "更新対象のデータが見つかりません。";
+		final String UPDATE_COMPLETE = "更新が完了しました。";
+
+		try {
+			
+			// 部署一覧取得
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+			
+            
+           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){
+				// 存在する場合はエラーメッセージを設定して更新入力画面に遷移
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+			
+			
+			if(searchDepartment.searchBy(null) != null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			 // 更新結果のメッセージを画面にセットし一覧画面に遷移
+            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
+
+            // forward 先で不用意な動作をしないために UpdateEmployeeInfoForm をクリア
+            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;
+		}
+	}
+}

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

@@ -9,6 +9,7 @@ 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 INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
     public static final String LOGIN_INFO_FORM = "loginInfoForm";

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

@@ -47,7 +47,19 @@ public class TransitionTargetPageNameKeyword {
 
 	// Department
 	// HTML
+	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
+	public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
+	public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
+	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 DELETE_DEPARTMENT = "/deleteDepartment";
 
 	/**
 	 * 管理者向けのページリストを返す
@@ -70,8 +82,13 @@ public class TransitionTargetPageNameKeyword {
 				SELECT_EMPLOYEE_INFO,
 				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
 				SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT
-        );
+				UPDATE_EMPLOYEE_RESULT,
+				SELECT_DEPARTMENT,
+				SELECT_DEPARTMENT_FORM_EMPTY,
+				INSERT_DEPARTMENT_INPUT,
+				SHOW_UPDATE_DEPARTMENT,
+				SHOW_UPDATE_DEPARTMENT);
+
 	}
 
 	/**
@@ -86,8 +103,7 @@ 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

@@ -0,0 +1,24 @@
+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 InsertDepartmentForm {
+	private String nmEmployee;
+
+	private Integer idDepartment;
+
+	private String nmDepartment;
+
+	public static Department convertToo(InsertDepartmentForm insertDepartmentForm) {
+		return new Department(
+				insertDepartmentForm.getIdDepartment(),
+				insertDepartmentForm.getNmDepartment());
+	}
+}

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

@@ -6,18 +6,18 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 部署検索条件用のFormクラス
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class SearchConditionDepartmentForm {
-
-    /** 部署ID */
+	/**
+	 * 部署ID
+	 */
 	private Integer idDepartment;
 
-    /** 部署名 */
+	/**
+	 * 部署名
+	 */
 	private String nmDepartment;
 
 	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
@@ -27,10 +27,17 @@ public class SearchConditionDepartmentForm {
 	        );
 	    }
 
-    public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm form) {
+	/**
+	     * 画面用（presentation 層）の SearchConditionEmployeeForm クラスから business 層の SearchConditionEmployee クラスに
+	     * 変換します。
+	     *
+	     * @param searchConditionEmployeeForm 画面用（presentation 層）の SearchConditionEmployeeForm インスタンス
+	     * @return business 層の SearchConditionEmployee インスタンス
+	     */
+	    public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
 	        return new SearchConditionDepartment(
-                form.getIdDepartment(),
-                form.getNmDepartment()
+	        		 searchConditionDepartmentForm.getIdDepartment(),
+		             searchConditionDepartmentForm.getNmDepartment()
 	        );
 	    }
 }

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

@@ -0,0 +1,32 @@
+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/resources/templates/insertDepartmentConfirm.html

@@ -0,0 +1,18 @@
+<!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

@@ -8,22 +8,23 @@
 	<!-- 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="/insertDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-		th:object="${departmentForm}">
-		<div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
+	<form action="insertDepatmentConfirm" 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>
@@ -37,7 +38,6 @@
 				<th class="header">部署名</th>
 				<td>
 					<label>
-
 						<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
 							type="text" />
 					</label>
@@ -45,32 +45,12 @@
 			</tr>
 			<tr>
 				<td class="btnArea" colspan="2">
-					<input type="submit" value="登録" />
+					<input type="submit" value="登録確認" />
 				</td>
 			</tr>
 		</table>
 	</form>
-	<a href="javascript:selectSubmit()">一覧に戻る</a>
+	<a href="showMenu">メニューに戻る</a>
 </body>
 
-<script>
-	function selectSubmit() {
-		const form = document.createElement('form');
-		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'selectDepartment');
-
-		// 動的送信用のHidden
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectDepartment");
-
-		form.appendChild(inputField);
-
-		// フォームをDOMに追加
-		document.body.appendChild(form);
-
-		form.submit();
-	}
-</script>
-
 </html>

src/main/resources/templates/insertDepartmentResult.html

@@ -0,0 +1,18 @@
+<!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,23 +26,24 @@
 			<td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><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>
+			<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>
-			<!-- ဒီနေရာမှာ ဌာနအသစ်ထည့်သွင်းခြင်း (部署登録) ကို ထည့်ပါ -->
-			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
-			</td>
-			<td class="description">新規で部署追加を行います。
-			</td>
+			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+			<td class="description">新規で部署追加を行います。</td>
 		</tr>
+
 	</table>
 </body>
 

src/main/resources/templates/selectDepartment.html

@@ -3,32 +3,38 @@
 
 <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">
+	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
 	<title>部署検索</title>
 </head>
 
 <body>
-	<h1>部署検索条件入力
+	<h1>
+		検索条件入力　　　
 		<div class="rightSection">
 			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
 	</h1>
-
 	<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 id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number" />
+					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
 				</td>
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
 				<td>
-					<input id="nmDepartment" placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
 				</td>
 			</tr>
 			<tr>
@@ -36,25 +42,31 @@
 					<input type="submit" value="検索" />
 				</td>
 				<td class="btnArea" colspan="2">
-					<button type="button" onclick="clearInput()">クリア</button>
+					<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:block th:if="${messageInfo != null}">
+		<script th:inline="javascript">
+			alert([[${messageInfo.message}]]);
+		</script>
+	</th:block>
 
+	<div class="header-spacing"></div>
 	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+		<!-- 検索結果が1件以上ある場合 -->
 		<table class="table-grid table-striped table-hover">
 			<thead>
 				<tr>
-					<th style="width: 100px;">部署ID</th>
-					<th style="width: 200px;">部署名</th>
-					<th style="width: 200px;">操作</th>
+					<th style="width: 150px;">部署ID</th>
+					<th style="width: 280px;">部署名</th>
+					<th style="width: 500px;">操作</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -62,58 +74,36 @@
 					<td th:text="${departmentForm.idDepartment}"></td>
 					<td th:text="${departmentForm.nmDepartment}"></td>
 					<td>
-						<button type="button"
-							th:onclick="'updateDepartment(' + ${departmentForm.idDepartment} + ')'">更新</button>
-						<button type="button"
-							th:onclick="'deleteDepartment(' + ${departmentForm.idDepartment} + ')'">削除</button>
+						<!-- 更新フォーム -->
+						<form action="showUpdateDepartment" 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>
 	</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('idDepartment').selectedIndex = 0;
 		document.getElementById('nmDepartment').value = '';
 	}
-		// 部署更新用のJavaScript
-		function updateDepartment(idDepartment) {
-			const form = document.createElement('form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'updateDepartmentInput'); // Update Controller ၏ URL သို့မဟုတ် Path
-
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("name", "idDepartment");
-			inputField.setAttribute("value", idDepartment);
-
-			form.appendChild(inputField);
-			document.body.appendChild(form);
-			form.submit();
-		}
 
 
-		// 部署削除用のJavaScript
-		function deleteDepartment(idDepartment) {
-			const form = document.createElement('form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'deleteDepartmentInput'); // Delete Controller ၏ URL သို့မဟုတ် Path
-
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("name", "idDepartment");
-			inputField.setAttribute("value", idDepartment);
-
-			form.appendChild(inputField);
-			document.body.appendChild(form);
-			form.submit();
-		}
 </script>
-</body>
 
 </html>

src/main/resources/templates/selectEmployee.html

@@ -14,7 +14,7 @@
 </head>
 <body>
 <h1>
-    検索条件入力</h1>
+    検索条件入力　　　
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>

src/main/resources/templates/updateDepartmentInput.html

@@ -7,69 +7,53 @@
 	<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>
+	<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="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-		th:object="${departmentForm}">
+	<form action="updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
+		th:object="${updateDepartmentForm}">
+
 		<div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
+			<span class="error" th:text="${messageError.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:selectSubmit()">一覧に戻る</a>
-</body>
-
-<script>
-	function selectSubmit() {
+	<a href="javascript:selectDepartmentSubmit()">一覧に戻る</a>
+	<script type="text/javascript">
+		function selectDepartmentSubmit() {
 			const form = document.createElement('form');
 			form.setAttribute('method', 'post');
 			form.setAttribute('action', 'selectDepartment');
-
-		// 動的送信用のHidden
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectDepartment");
-
-		form.appendChild(inputField);
-
-		// フォームをDOMに追加
 			document.body.appendChild(form);
-
 			form.submit();
 		}
 	</script>
+</body>
 
 </html>