コメントの修正

社員のものからコピーしたままになっていたので部署に合うように変更

.classpath

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
-		<attributes>
-			<attribute name="module" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

.gitignore

@@ -1 +0,0 @@
-/target/

.project

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>em-spring</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>

.settings/.jsdtscope

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/webapp"/>
-	<classpathentry excluding="**/node_modules/*|**/*.min.js|**/bower_components/*" kind="src" path="target/m2e-wtp/web-resources"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>

.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

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

@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-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=enabled
-org.eclipse.jdt.core.compiler.source=17

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

@@ -1,10 +0,0 @@
-<?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>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="17"/>
-  <installed facet="jst.web" version="4.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>

.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary

.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -1 +0,0 @@
-Window

.settings/org.eclipse.wst.validation.prefs

@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1

src/main/java/com/example/rhizome/aop/aspect/PermissionCheckAspect.java

@@ -1,16 +1,17 @@
 package com.example.rhizome.aop.aspect;
 
-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.LoginUserForm;
-import com.example.rhizome.exception.InsufficientPermissionException;
+import javax.servlet.http.HttpServletRequest;
+
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletRequest;
+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.LoginUserForm;
+import com.example.rhizome.exception.InsufficientPermissionException;
 
 /**
  * 権限チェック用のAOP
@@ -19,96 +20,95 @@ import javax.servlet.http.HttpServletRequest;
 @Component
 public class PermissionCheckAspect {
 
-    HttpServletRequest request;
+	HttpServletRequest request;
 
-    @Autowired
-    public PermissionCheckAspect(HttpServletRequest request) {
-        this.request = request;
-    }
+	@Autowired
+	public PermissionCheckAspect(HttpServletRequest request) {
+		this.request = request;
+	}
 
-    // Aspectのフックを定義（今回はPermissionCheckアノテーションが定義されているメソッドが動作するタイミング）
-    @Pointcut("@annotation(com.example.rhizome.aop.aspect.PermissionCheck)")
-    public void permissionCheckMethod() {
-    }
+	// Aspectのフックを定義（今回はPermissionCheckアノテーションが定義されているメソッドが動作するタイミング）
+	@Pointcut("@annotation(com.example.rhizome.aop.aspect.PermissionCheck)")
+	public void permissionCheckMethod() {
+	}
 
-    /**
-     * 権限チェック
-     */
-    @Before("permissionCheckMethod()")
-    public void checkPermission() {
-        // ログインユーザの取得
-        LoginUserForm loginUserForm = (LoginUserForm) request.getSession().getAttribute(SessionKeyword.LOGIN_USER);
+	/**
+	 * 権限チェック
+	 */
+	@Before("permissionCheckMethod()")
+	public void checkPermission() {
+		// ログインユーザの取得
+		LoginUserForm loginUserForm = (LoginUserForm) request.getSession().getAttribute(SessionKeyword.LOGIN_USER);
 
-        // ログインユーザが取得できない場合、または権限がない場合はエラー画面に遷移
-        if (loginUserForm == null || !hasRequiredPermission(request.getRequestURI(), loginUserForm)) {
-            throw new InsufficientPermissionException("不正な遷移です");
-        }
+		// ログインユーザが取得できない場合、または権限がない場合はエラー画面に遷移
+		if (loginUserForm == null || !hasRequiredPermission(request.getRequestURI(), loginUserForm)) {
+			throw new InsufficientPermissionException("不正な遷移です");
+		}
 
-    }
+	}
 
-    /**
-     * 遷移先のURLとログインユーザの権限から、遷移可否を判定する
-     *
-     * @param targetURL     遷移したいURL
-     * @param loginUserForm リクエスト元のユーザ
-     * @return true:遷移可 false:遷移不可
-     */
-    private boolean hasRequiredPermission(String targetURL, LoginUserForm loginUserForm) {
+	/**
+	 * 遷移先のURLとログインユーザの権限から、遷移可否を判定する
+	 *
+	 * @param targetURL     遷移したいURL
+	 * @param loginUserForm リクエスト元のユーザ
+	 * @return true:遷移可 false:遷移不可
+	 */
+	private boolean hasRequiredPermission(String targetURL, LoginUserForm loginUserForm) {
 
-        // 管理者権限
-        if (isAdminTransition(targetURL, loginUserForm)) {
-            return true;
-        }
+		// 管理者権限
+		if (isAdminTransition(targetURL, loginUserForm)) {
+			return true;
+		}
 
-        // 一般権限
-        if (isUserTransition(targetURL, loginUserForm)) {
-            return true;
-        }
+		// 一般権限
+		if (isUserTransition(targetURL, loginUserForm)) {
+			return true;
+		}
 
-        // アクセス不許可の場合の処理（不正アクセス画面に遷移）
-        return false;
+		// アクセス不許可の場合の処理（不正アクセス画面に遷移）
+		return false;
 
-    }
+	}
 
-    /**
-     * 管理者用のアカウントで管理者向けのページアクセスか
-     *
-     * @param targetURL     遷移したいURL
-     * @param loginUserForm リクエスト元のユーザ
-     * @return true:遷移可 false:遷移不可
-     */
-    private boolean isAdminTransition(String targetURL, LoginUserForm loginUserForm) {
+	/**
+	 * 管理者用のアカウントで管理者向けのページアクセスか
+	 *
+	 * @param targetURL     遷移したいURL
+	 * @param loginUserForm リクエスト元のユーザ
+	 * @return true:遷移可 false:遷移不可
+	 */
+	private boolean isAdminTransition(String targetURL, LoginUserForm loginUserForm) {
 
-        // 管理者か
-        if (!loginUserForm.isAdminUser()) {
-            return false;
-        }
+		// 管理者か
+		if (!loginUserForm.isAdminUser()) {
+			return false;
+		}
 
-        // 管理者向けのページ遷移か
-        if (!TransitionTargetPageNameKeyword.getAdminPageList().contains(targetURL)) {
-            return false;
-        }
+		// 管理者向けのページ遷移か
+		if (!TransitionTargetPageNameKeyword.getAdminPageList().contains(targetURL)) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * 一般ユーザ用のアカウントで一般ユーザ向けのページアクセスか
-     *
-     * @param targetURL     遷移したいURL
-     * @param loginUserForm リクエスト元のユーザ
-     * @return true:遷移可 false:遷移不可
-     */
-    private boolean isUserTransition(String targetURL, LoginUserForm loginUserForm) {
+	/**
+	 * 一般ユーザ用のアカウントで一般ユーザ向けのページアクセスか
+	 *
+	 * @param targetURL     遷移したいURL
+	 * @param loginUserForm リクエスト元のユーザ
+	 * @return true:遷移可 false:遷移不可
+	 */
+	private boolean isUserTransition(String targetURL, LoginUserForm loginUserForm) {
 
-        // 管理者か
-        if (loginUserForm.isAdminUser()) {
-            return false;
-        }
+		// 管理者か
+		if (loginUserForm.isAdminUser()) {
+			return false;
+		}
 
-        // 一般ユーザ向けのページ遷移か
-        return TransitionTargetPageNameKeyword.getUserPageList().contains(targetURL);
+		// 一般ユーザ向けのページ遷移か
+		return TransitionTargetPageNameKeyword.getUserPageList().contains(targetURL);
 
-    }
+	}
 }
-

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/SearchDepartment.java

@@ -6,12 +6,12 @@ import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
 public interface SearchDepartment {
-	//すべての部署を取得する
-    List<Department> selectAll();
-    //部署ID・部署目の完全一致検索
-    List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
-    //部署名の部分一致検索
-    List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
-    //↑下から変更 SelectDepartmentControllerのsearchByWithLikeでエラーでたから
-    //List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
+	List<Department> selectAll();
+
+	List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
+
+	List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
+
+	Department searchDepartmentByIdDepartment(Integer idDepartment);
+
 }

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

@@ -0,0 +1,8 @@
+package com.example.rhizome.app.domain.service;
+
+import com.example.rhizome.app.domain.model.Department;
+
+public interface UpdateDepartment {
+	void updateDepartment(Department beforeDepartment, Department updateDepartment);
+
+}

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

@@ -1,22 +1,33 @@
 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 {
-	 DepartmentRepository departmentRepository;
 
-	    @Autowired
-	    public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
-	        this.departmentRepository = departmentRepository;
-	    }
+	DepartmentRepository departmentRepository;
 
-	    public void deleteDepartment(Integer idDepartment) {
-	        // ★考える：Repository のどのメソッドで「IDを指定して削除」できる？
-	        //          （お手本の DeleteEmployeeImpl を見る）
-	    	departmentRepository.deleteById(idDepartment);
-	    }
+	@Autowired
+	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+
+	/**
+	 * idDepartment を元に department データを削除
+	 *
+	 * @param idDepartment 削除対象のidDepartment
+	 */
+	public void deleteDepartment(Integer idDepartment) {
+		departmentRepository.deleteById(idDepartment);
+	}
 
 }

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

@@ -1,12 +1,10 @@
 package com.example.rhizome.app.domain.service.impl;
 
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.example.rhizome.app.domain.service.DeleteEmployee;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Employee レコード削除関連の機能を持つサービス

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

@@ -1,15 +1,13 @@
 package com.example.rhizome.app.domain.service.impl;
 
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.example.rhizome.app.domain.model.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.Login;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * ログイン系の機能を集約させるサービスクラスです。

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;
@@ -17,71 +16,73 @@ import com.example.rhizome.app.infra.repository.DepartmentRepository;
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
  */
-//サービスクラスとして登録
 @Service
-//トランザクション管理
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
 
-	//Repositoryを保持するフィールド
-    DepartmentRepository departmentRepository;
+	DepartmentRepository departmentRepository;
 
-    /**
-     * コンストラクタ
-     *
-     * @param departmentRepository DI対象
-     */
-    @Autowired
-    public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
-        this.departmentRepository = departmentRepository;
-    }
+	/**
+	 * コンストラクタ
+	 *
+	 * @param departmentRepository DI対象
+	 */
+	@Autowired
+	public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
 
-    /**
-     * 部署情報を全件取得する
-     *
-     * @return 取得した部署情報レコード全件
-     */
-    public List<Department> selectAll() {
-        return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
-    }
+	/**
+	 * 部署情報を全件取得する
+	 *
+	 * @return 取得した部署情報レコード全件
+	 */
+	public List<Department> selectAll() {
+		return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
+	}
 
-    /**
-     * searchConditionDepartment の情報を元に Department のレコードを取得
-     *
-     * @param searchConditionDepartment 検索条件
-     * @return 検索結果のレコード
-     */
-    public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
-        // 動的に検索条件を絞り込む
-        // Specification は Criteria API の Predicate をラップしたもの
-        return DepartmentEntity
-                .createDepartmentList(
-                        departmentRepository.findAll(Specification
-                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
-                        )
-                );
+	/**
+	 * searchConditionDepartment の情報を元に Department のレコードを取得
+	 *
+	 * @param searchConditionDepartment 検索条件
+	 * @return 検索結果のレコード
+	 */
+	public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
+		// 動的に検索条件を絞り込む
+		// Specification は Criteria API の Predicate をラップしたもの
+		return DepartmentEntity
+				.createDepartmentList(
+						departmentRepository.findAll(Specification
+								.where(DepartmentRepository
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+								.and(DepartmentRepository
+										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
 
-    }
+	}
 
-    /**
-     * searchConditionDepartment の情報を元に Department のレコードを取得
-     * 部分一致検索
-     *
-     * @param searchConditionDepartment 検索条件
-     * @return 検索結果のレコード
-     */
-    @Override
-    public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
-        // 動的に検索条件を絞り込む
-        // Specification は Criteria API の Predicate をラップしたもの
-        return DepartmentEntity
-                .createDepartmentList(
-                        departmentRepository.findAll(Specification
-                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
-                        )
-                );
+	/**
+	 * searchConditionDepartment の情報を元に Department のレコードを取得
+	 * 部分一致検索
+	 *
+	 * @param searchConditionDepartment 検索条件
+	 * @return 検索結果のレコード
+	 */
+	public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
+		// 動的に検索条件を絞り込む
+		// Specification は Criteria API の Predicate をラップしたもの
+		return DepartmentEntity
+				.createDepartmentList(
+						departmentRepository.findAll(Specification
+								.where(DepartmentRepository
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+								.and(DepartmentRepository
+										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
 
-    }
+	}
+
+	//idDepartmentに合致するレコード取得
+	public Department searchDepartmentByIdDepartment(Integer idDepartment) {
+		return DepartmentEntity
+				.createDepartment(departmentRepository.findByIdDepartment(idDepartment).orElse(new DepartmentEntity()));
+	}
 }

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

@@ -0,0 +1,53 @@
+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;
+
+/**
+ * department の更新系の機能を集約させるサービスクラスです。
+ */
+@Service
+@Transactional
+public class UpdateDepartmentImpl implements UpdateDepartment {
+
+	DepartmentRepository departmentRepository;
+
+	@Autowired
+	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+
+	/**
+	 * department の情報を元に department table のレコードを更新する
+	 *
+	 * @param beforeDepartment 更新前のデータ
+	 * @param updateDepartment 更新後のデータ
+	 */
+	public void updateDepartment(Department beforeDepartment, Department updateDepartment) {
+		// TODO 自動生成されたメソッド・スタブ
+		departmentRepository.save(DepartmentEntity.convertFrom(mergeDepartment(beforeDepartment, updateDepartment)));
+
+	}
+
+	/**
+	 * 更新前のデータと更新対象のデータをマージする
+	 *
+	 * @param beforeDepartment 更新前のデータ
+	 * @param updateDepartment 更新対象のデータ
+	 * @return マージしたデータ
+	 */
+
+	private Department mergeDepartment(Department beforeDepartment, Department updateDepartment) {
+		return new Department(
+				updateDepartment.getIdDepartment(),
+				updateDepartment.getNmDepartment());
+
+	}
+
+}

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

@@ -6,15 +6,22 @@
  */
 package com.example.rhizome.app.infra.entity;
 
+import java.util.List;
+import java.util.Optional;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.example.rhizome.app.domain.model.Department;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-import java.util.List;
-
 /**
  * Department テーブルの Entity
  *
@@ -27,46 +34,59 @@ import java.util.List;
 @AllArgsConstructor
 public class DepartmentEntity {
 
-    /**
-     * 部署ID
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id_department", nullable = false)
-    private Integer idDepartment;
-    /**
-     * 部署名
-     */
-    @Column(name = "nm_department", nullable = false)
-    private String nmDepartment;
+	/**
+	 * 部署ID
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id_department", nullable = false)
+	private Integer idDepartment;
+	/**
+	 * 部署名
+	 */
+	@Column(name = "nm_department", nullable = false)
+	private String nmDepartment;
 
-    /**
-     * DepartmentEntity（DataAccess層依存）から Department（BusinessLogic層依存型）に変換します。
-     *
-     * @param departmentEntityList department Table のリスト
-     * @return List<Department> リスト
-     */
-    public static List<Department> createDepartmentList(List<DepartmentEntity> departmentEntityList) {
+	/**
+	 * DepartmentEntity（DataAccess層依存）から Department（BusinessLogic層依存型）に変換します。
+	 *
+	 * @param departmentEntityList department Table のリスト
+	 * @return List<Department> リスト
+	 */
+	public static List<Department> createDepartmentList(List<DepartmentEntity> departmentEntityList) {
 
-        // Stream API を利用するとこうなります。
-        return departmentEntityList
-                .stream()
-                .map(departmentEntity -> new Department(
-                        departmentEntity.getIdDepartment(),
-                        departmentEntity.getNmDepartment()
-                )).toList();
-    }
+		// Stream API を利用するとこうなります。
+		return departmentEntityList
+				.stream()
+				.map(departmentEntity -> new Department(
+						departmentEntity.getIdDepartment(),
+						departmentEntity.getNmDepartment()))
+				.toList();
+	}
+
+	/**
+	 * Department（BusinessLogic層依存型） から DepartmentEntity（DataAccess層依存）に変換します。
+	 *
+	 * @param department department モデルの値
+	 * @return DepartmentEntity に変換したインスタンス
+	 */
+	public static DepartmentEntity convertFrom(Department department) {
+		return new DepartmentEntity(
+				department.getIdDepartment(),
+				department.getNmDepartment());
+	}
+
+	public static Optional<Department> createDepartmentList(Optional<DepartmentEntity> departmentEntityList) {
+
+		return departmentEntityList.map(departmentEntity -> new Department(departmentEntity.getIdDepartment(),
+				departmentEntity.getNmDepartment()));
+	}
+
+	public static Department createDepartment(DepartmentEntity DepartmentEntity) {
+		// 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
+		return new Department(
+				DepartmentEntity.getIdDepartment(),
+				DepartmentEntity.getNmDepartment());
+	}
 
-    /**
-     * Department（BusinessLogic層依存型） から DepartmentEntity（DataAccess層依存）に変換します。
-     *
-     * @param department department モデルの値
-     * @return DepartmentEntity に変換したインスタンス
-     */
-    public static DepartmentEntity convertFrom(Department department) {
-        return new DepartmentEntity(
-                department.getIdDepartment(),
-                department.getNmDepartment()
-        );
-    }
 }

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

@@ -7,23 +7,16 @@
 package com.example.rhizome.app.infra.entity;
 
 
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.*;
+import java.util.List;
+
 /**
  * EmployeeテーブルのEntity
  *
@@ -43,7 +36,6 @@ public class EmployeeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id_employee", nullable = false)
     private Integer idEmployee;
-    
 
     /**
      * 社員名
@@ -72,7 +64,6 @@ public class EmployeeEntity {
     /**
      * 管理者権限
      */
-//    @Transient
     @Column(name = "admin_auth", nullable = false)
     private Integer adminAuth;
 

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

@@ -1,14 +1,14 @@
 package com.example.rhizome.app.infra.repository;
 
+import java.util.Optional;
+
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-//DepartmentRntity: 部署の実体
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 
-
 /**
  * Specification:
  * 関数型インターフェースです。
@@ -21,38 +21,36 @@ import com.example.rhizome.app.infra.entity.DepartmentEntity;
  * CriteriaBuilder:条件式（Where句以降の条件）の部分のクエリを作るためのビルダーです。
  * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
  */
-
-//部署情報をデータベースから取得するRepository
-//                                           JpaRepositoryを継承する
 @Repository
-public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
+public interface DepartmentRepository
+		extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
 
-//部署IDの完全一致検索条件を作成する
-    static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-        //部署IDがnullなら条件を設定しない
-        return idDepartment == null ?
-                null :
-                // 戻り値の型 Specification<DepartmentEntity> にキャスト
-                (Specification<DepartmentEntity>)
-                        // ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
-                        // を作成している
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
-    }
+	static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
+		return idDepartment == null ? null :
+		// 戻り値の型 Specification<DepartmentEntity> にキャスト
+				(Specification<DepartmentEntity>)
+				// ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
+				// を作成している
+				(root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
+	}
 
-    //部署名の完全一致条件を作成する
-    static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
-    	//部署名が未入力なら条件を設定しない
-        return (nmDepartment == null || nmDepartment.isEmpty()) ?
-                null :
-                (Specification<DepartmentEntity>)
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), nmDepartment);
-    }
+	static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
+		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
+				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+						.like(root.get("nmDepartment"), nmDepartment);
+	}
 
+	static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
+		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
+				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+						.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
+	}
+
+	static void deleteBy(Integer id) {
+
+	}
+
+	//idで検索
+	Optional<DepartmentEntity> findByIdDepartment(Integer idDepartment);
 
-    static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
-        return (nmDepartment == null || nmDepartment.isEmpty()) ?
-                null :
-                (Specification<DepartmentEntity>)
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
-    }
 }

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

@@ -1,5 +1,7 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -12,61 +14,112 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.example.rhizome.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.DeleteDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployee;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
+import com.example.rhizome.app.presentation.form.MessageForm;
 
+/**
+ * 削除処理のコントローラ
+ */
 @Controller
 public class DeleteDepartmentController {
-	 private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
-	    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
 
-	    HttpSession httpSession;
-	    DeleteDepartment deleteDepartment;
-	    SearchDepartment searchDepartment;
-	    SearchEmployee searchEmployee;   // 所属社員の確認に使う（既存）
-	    
-        //コンストラクタ
-	    @Autowired
-	    public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment,
-	                                      SearchDepartment searchDepartment, SearchEmployee searchEmployee) {
-	        this.httpSession = httpSession;
-	        this.deleteDepartment = deleteDepartment;
-	        this.searchDepartment = searchDepartment;
-	        this.searchEmployee = searchEmployee;
-	    }
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	    @RequestMapping(value = TransitionTargetPageNameKeyword.DELETE_DEPARTMENT, method = RequestMethod.POST)
-	    public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment, Model model) {
+	HttpSession httpSession;
+	DeleteDepartment deleteDepartment;
+	SearchDepartment searchDepartment;
+	SearchEmployee searchEmployee;
 
-	        final String UNKNOWN_ID = "削除対象のIDが不明です。";
-	        final String HAS_EMPLOYEE = "1名以上が所属している部署は削除出来ません。";
-	        final String DELETE_COMPLETE = "削除しました。";
+	@Autowired
+	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
+			HttpSession httpSession, SearchEmployee searchEmployee) {
+		this.httpSession = httpSession;
+		this.deleteDepartment = deleteDepartment;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployee = searchEmployee;
+	}
 
-	        try {
-	            // ★① idDepartment が null、または searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) が空
-	            //     → MESSAGE_ERROR に UNKNOWN_ID を載せて一覧へ
-	        	deleteDepartment.deleteDepartment(idDepartment);
-	            // ★② searchEmployee.searchEmployeeByIdDepartment(idDepartment) が空でない
-	            //     → MESSAGE_ERROR に HAS_EMPLOYEE を載せて一覧へ
-	        	model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,DepartmentForm.convertFrom(searchDepartment.selectAll()));
-	            // ★③ deleteDepartment.deleteDepartment(idDepartment) → MESSAGE_INFO に DELETE_COMPLETE を載せて一覧へ
-	        	model.addAttribute("searchConditinDepartmentForm", new SearchConditionDepartmentForm());
+	/**
+	 * 削除処理のコントローラ
+	 *
+	 * @param idDepartment 削除対象のdepartmentId
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
+	public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+		try {
+			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			// 作成した部署一覧をセット
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-//	            return "一覧へ戻る（ステップ 2-5 で決める）";
-	        	return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-	        } catch (Exception e) {
-	        	
-	            httpSession.invalidate();
-	            e.printStackTrace();
-	            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-	            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,"部署を削除できませんでした");
-//	            return TransitionTargetPageNameKeyword.ERROR_HTML;
-	            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-	        }
-	    }
+			// 削除処理実施
+			deleteExec(
+					model,
+					idDepartment,
+					LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
+
+			// 検索画面に遷移
+			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
+
+		} catch (Exception e) {
+			// ログイン情報の破棄
+			httpSession.invalidate();
+
+			e.printStackTrace();
+			// エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			// エラー画面遷移
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+	}
+
+	/**
+	 * 削除処理実施
+	 *
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @param idDepartment 削除対象のdepartmentId
+	 * @param loginUser  ログインユーザー情報
+	 */
+	private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
+
+		final String DELETE_COMPLETE = "削除しました。";
+		final String ID_TO_DELETED_IS_UNKNOWN = "削除対象のIDが不明です。";
+		final String YOU_CANNOT_DELETE_A_DEPARTMENT_THAT_HAS_ONE_OR_MORE_MEMBERS_ASSIGNED_TO_IT = "1名以上が所属している部署は削除出来ません。";
+
+		if (searchDepartment.searchDepartmentByIdDepartment(idDepartment) == null) {
+			// エラーメッセージをセット
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(ID_TO_DELETED_IS_UNKNOWN));
+			return;
+		}
+
+		if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(YOU_CANNOT_DELETE_A_DEPARTMENT_THAT_HAS_ONE_OR_MORE_MEMBERS_ASSIGNED_TO_IT));
+			return;
+		}
+		// 削除を実施
+		deleteDepartment.deleteDepartment(idDepartment);
+
+		// 削除完了したメッセージをセット
+		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+
+	}
 }

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

@@ -1,20 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import com.example.rhizome.app.domain.model.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.Login;
@@ -25,6 +11,18 @@ import com.example.rhizome.app.presentation.form.LoginInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdatePersonalUserForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpSession;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DO_LOGIN;
 
 /**
  * ログイン関連のコントローラ
@@ -108,8 +106,7 @@ public class LoginController {
                 // 編集対象のログイン者の情報を画面に渡す値にセット
                 model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, UpdatePersonalUserForm.convertFrom(loginUser));
                 // 個人の情報更新ページに遷移
-                  return TransitionTargetPageNameKeyword.MENU_HTML;
-//                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
+                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
             }
 
             // メニュー画面に遷移

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

@@ -2,7 +2,6 @@ package com.example.rhizome.app.presentation.controller;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
-//import java.util.List;
 
 import javax.servlet.http.HttpSession;
 
@@ -13,17 +12,18 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import com.example.rhizome.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
 
 /**
- * 部署検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
+ * 部署画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
  */
-
-//          検索Controller
 @Controller
 public class SelectDepartmentController {
 
@@ -32,96 +32,83 @@ public class SelectDepartmentController {
 	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	//    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-
-	//    private static final String DEPARTMENT_HTML = "/department";
-
 	HttpSession httpSession;
 	SearchDepartment searchDepartment;
+	SearchEmployeeInfo searchEmployeeInfo;
 
 	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment serchDepartment) {
+	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
 		this.httpSession = httpSession;
-		this.searchDepartment = serchDepartment;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployeeInfo = searchEmployeeInfo;
 	}
 
-	//空の検索条件FormをこのControllerの画面用に用意する
 	@ModelAttribute
 	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
 		return new SearchConditionDepartmentForm();
 	}
 
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
+	/**
+	 * 社員検索画面表示処理コントローラ
+	 *
+	 * @param searchConditionDepartmentForm 検索画面のフォーム
+	 * @param model                       ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
 	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
 		try {
-			// ★考える：①検索サービスを呼ぶ（Form→Model変換 → 部分一致のメソッド）
-			//          ②結果(List<Department>)を DepartmentForm.convertFrom(...) で画面用に変換
-			//          ③ model に PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST という名前で載せる
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm
-					.convertFrom(searchDepartment.searchByWithLike(SearchConditionDepartmentForm
-							.convertTo(searchConditionDepartmentForm))));
 
+			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			// 作成した部署一覧をセット
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+
+			// 検索条件を元に検索を実施
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
+					searchDepartment
+							.searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
+
+			// 検索ページに遷移
 			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-		} catch (Exception e) {
-			//httpSessionを破棄
-			httpSession.invalidate();
 
-			//エラー内容を出力
+		} catch (Exception e) {
+			// ログイン情報の破棄
+			httpSession.invalidate();
 			e.printStackTrace();
 
-			//ログにエラーを記録
+			// エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-
-			//エラー画面へ遷移
+			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
+
 	}
 
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY, method = RequestMethod.POST)
+	/**
+	 * 部署検索画面表示処理コントローラ
+	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
+	 *
+	 * @param model ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
 	public String select(Model model) {
-		try {
-			// ★全件取得 → DepartmentForm に変換 → DEPARTMENT_FORM_LIST で model へ
-			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-		} catch (Exception e) {
-			httpSession.invalidate();
-			e.printStackTrace();
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
 
-		}
+		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+		// 作成した部署一覧をセット
+		model.addAttribute(
+				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+				DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
+		// 検索ページに遷移
+		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
 	}
+
 }
-
-/**
- * 社員検索画面表示処理コントローラ
- *
- * @param searchConditionEmployeeForm 検索画面のフォーム
- * @param model                       ビューにデータを渡すためのコンテナ
- * @return 遷移先の画面
- */
-
-//    @PermissionCheck
-//    @SessionCheck
-//    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT,
-//    method = RequestMethod.POST)
-//    public String showDepartment() {
-//    	
-//        return TransitionTargetPageNameKeyword.DEPARTMENT_HTML;
-//
-//    
-//    @RequestMapping(value =TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-//    public String select(DepartmentForm departmentForm, Model model) {
-//    	try {
-//    		
-//    		model.addAttribute(
-//    				PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST,EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(
-//                          SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm())
-//    				);		
-
-//    /**
-//     * 社員検索画面表示処理コントローラ
-//     * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
-//     *
-//     * @param model ビューにデータを渡すためのコンテナ
-//     * @return 遷移先の画面

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

@@ -1,17 +1,5 @@
 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;
@@ -21,6 +9,16 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.EmployeeInfoForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpSession;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -32,8 +30,6 @@ public class SelectEmployeeController {
     private final static Logger LOGGER = Logger.getLogger(SelectEmployeeController.class.getName());
     // エラーメッセージ用の定数フィールド
     private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    
-    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
 
     HttpSession httpSession;
     SearchDepartment searchDepartment;
@@ -64,7 +60,6 @@ public class SelectEmployeeController {
     public String select(SearchConditionEmployeeForm searchConditionEmployeeForm, Model model) {
 
         try {
-        	
 
             // 部署一覧を取得し、画面に返す用のクラスに詰め替える
             // 作成した部署一覧をセット
@@ -80,7 +75,6 @@ public class SelectEmployeeController {
             return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
 
 
-            
         } catch (Exception e) {
             // ログイン情報の破棄
             httpSession.invalidate();

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

@@ -0,0 +1,85 @@
+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 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.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
+import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
+
+/**
+ * 更新対象の Department が存在するか確認する為のコントローラ
+ */
+@Controller
+public class UpdateDepartmentController {
+
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	SearchDepartment searchDepartment;
+	SearchEmployeeInfo searchEmployeeInfo;
+
+	@Autowired
+	public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployeeInfo = searchEmployeeInfo;
+	}
+
+	@ModelAttribute
+	public SearchConditionEmployeeForm searchConditionEmployeeForm() {
+		return new SearchConditionEmployeeForm();
+	}
+
+	/**
+	 * 更新対象の department が存在するか確認する為のコントローラ
+	 *
+	 * @param idDepartment 更新対象の employee の id
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DAPERTMENT, method = RequestMethod.POST)
+	public String showUpdateDepatment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
+		try {
+			// 部署一覧を取得し画面に返す値としてセット
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.searchDepartmentByIdDepartment(idDepartment)));
+
+			// 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;
+
+		}
+	}
+}

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

@@ -0,0 +1,129 @@
+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.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.SearchEmployee;
+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.UpdateDepartmentInfoForm;
+
+/**
+ * employee を更新して結果を返す為のコントローラ
+ */
+@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;
+	SearchEmployee searchEmployee;
+	UpdateDepartment updateDepartment;
+
+	@Autowired
+	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployee searchEmployee, UpdateDepartment updateDepartment) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployee = searchEmployee;
+		this.updateDepartment = updateDepartment;
+	}
+
+	/**
+	 * 更新結果画面表示処理
+	 *
+	 * @param updateDepartmentInfoForm 更新画面のフォーム
+	 * @param model                  ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
+	public String employeeUpdateResult(@ModelAttribute UpdateDepartmentInfoForm updateDepartmentInfoForm, Model model) {
+
+		final String DEPARTMENT_WITH_THE_SAME_NAME = "既に同名の部署が存在するか、値が変更されていません。";
+		final String NOTHING = "項目が空欄です。";
+		final String NO_TARGET = "更新対象のデータが見つかりません。";
+
+		final String UPDATE_COMPLETE = "更新が完了しました。";
+
+		try {
+
+			// 部署一覧取得
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+
+			// 既に登録済みの部署名が存在するか
+			if (searchDepartment.searchBy(
+					new SearchConditionDepartment(null, updateDepartmentInfoForm.getNmDepartment())).size() != 0) {
+				System.out.println("同一部署名");
+				// 存在する場合はエラーメッセージを設定して更新入力画面に遷移
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(DEPARTMENT_WITH_THE_SAME_NAME));
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, updateDepartmentInfoForm);
+
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+			//　画面から渡ってきた値が必須を満たしているか(空白チェック)
+			if (!UpdateDepartmentInfoForm.hasErrorParameter(updateDepartmentInfoForm)) {
+				System.out.println("部署必須否");
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, updateDepartmentInfoForm);
+
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			// 更新前のデータを取得
+			Department beforeDepartment = searchDepartment
+					.searchDepartmentByIdDepartment(updateDepartmentInfoForm.getIdDepartment());
+			if (beforeDepartment.getIdDepartment() == null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, updateDepartmentInfoForm);
+
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			// 画面用の型からビジネスロジック用のモデルに変換し、Updateを実行
+			updateDepartment.updateDepartment(beforeDepartment,
+					updateDepartmentInfoForm.convertTo(updateDepartmentInfoForm));
+
+			// 更新結果のメッセージを画面にセットし一覧画面に遷移
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
+
+			// forward 先で不用意な動作をしないために updateDepartmentInfoForm をクリア
+			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
+
+		} catch (Exception e) {
+			// ログイン情報の破棄
+			httpSession.invalidate();
+			e.printStackTrace();
+			// エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			// エラー画面遷移
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+
+	}
+
+}

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

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

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

@@ -7,106 +7,100 @@ import java.util.Set;
  */
 public class TransitionTargetPageNameKeyword {
 
-    // 共通
-    public static final String LOGIN_HTML = "login";
+	// 共通
+	public static final String LOGIN_HTML = "login";
 
-    // 一般向け
-    public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
-    public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
+	// 一般向け
+	public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
+	public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
 
-    // 管理者向け
-    public static final String MENU_HTML = "menu";
-    public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
-    public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
-    public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
-    public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
-    public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
-    public static final String DEPARTMENT_HTML = "department";
+	// 管理者向け
+	public static final String MENU_HTML = "menu";
+	public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
+	public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
+	public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
+	public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
+	public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
 
-    public static final String ERROR_HTML = "error";
+	public static final String ERROR_HTML = "error";
 
-    // 共通(Controller)
-    public static final String INDEX_BLANK = "";
-    public static final String INDEX_SLASH = "/";
-    public static final String INDEX_LOGIN = "/login";
-    public static final String LOGOUT = "/logout";
-    public static final String DO_LOGIN = "/doLogin";
-//    public static final String DEPARTMENT_HTML = "/department";
+	// 共通(Controller)
+	public static final String INDEX_BLANK = "";
+	public static final String INDEX_SLASH = "/";
+	public static final String INDEX_LOGIN = "/login";
+	public static final String LOGOUT = "/logout";
+	public static final String DO_LOGIN = "/doLogin";
 
-    // 一般向け(Controller)
-    public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
+	// 一般向け(Controller)
+	public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
 
-    // 管理者向け(Controller)
-    public static final String DELETE_EMPLOYEE = "/deleteEmployee";
-    public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
-    public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
-    public static final String INSERT_EMPLOYEE = "/insertEmployee";
-    public static final String SHOW_MENU = "/showMenu";
-    public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
-    public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
-    public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
-    public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
-    public static final String SHOW_DEPARTMENT = "/department";
-//    public static final String SELECT_DEPARTMENT = "/selectDepartment";
-    
+	// 管理者向け(Controller)
+	public static final String DELETE_EMPLOYEE = "/deleteEmployee";
+	public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
+	public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
+	public static final String INSERT_EMPLOYEE = "/insertEmployee";
+	public static final String SHOW_MENU = "/showMenu";
+	public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
+	public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
+	public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
+	public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
+	// Department
+	// HTML
+	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
+	// Controller
+	public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
+	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/departmentAll";
+	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
+	public static final String INSERT_DEPARTMENT_INPUT = "/";
+	public static final String INSERT_DEPARTMENT_CONFIRM = "/";
+	public static final String INSERT_DEPARTMENT = "/";
+	public static final String SHOW_UPDATE_DAPERTMENT = "/showUpdateDepartment";
+	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
 
-    
+	/**
+	 * 管理者向けのページリストを返す
+	 *
+	 * @return 管理者向けのページリスト
+	 */
+	public static Set<String> getAdminPageList() {
 
-    // Department
-    // HTML             実装手順書ステップ1-2通りの定数追加
-    public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
-    
-    // Controller       実装手順書ステップ1-2通りの定数追加 -> 管理者向けと重複、エラーでたため一旦コメアウト
-    public static final String SELECT_DEPARTMENT = "/selectDepartment";
-    
- // ステップ2-3*TransitionTargetPageNameKeyword の Department(Controller) の枠に追記
-    public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-    
-    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
+		return Set.of(
+				INDEX_BLANK,
+				INDEX_SLASH,
+				INDEX_LOGIN,
+				LOGOUT,
+				DO_LOGIN,
+				DELETE_EMPLOYEE,
+				INSERT_EMPLOYEE_INPUT,
+				INSERT_EMPLOYEE_CONFIRM,
+				INSERT_EMPLOYEE,
+				SHOW_MENU,
+				SELECT_EMPLOYEE_INFO,
+				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
+				SHOW_UPDATE_EMPLOYEE,
+				UPDATE_EMPLOYEE_RESULT,
+				SELECT_DEPARTMENT_INFO,
+				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
+				DELETE_DEPARTMENT,
+				SHOW_UPDATE_DAPERTMENT,
+				UPDATE_DEPARTMENT_RESULT);
+	}
 
-    /**
-     * 管理者向けのページリストを返す
-     *
-     * @return 管理者向けのページリスト
-     */
-    public static Set<String> getAdminPageList() {
-
-        return Set.of(
-                INDEX_BLANK,
-                INDEX_SLASH,
-                INDEX_LOGIN,
-                LOGOUT,
-                DO_LOGIN,
-                DELETE_EMPLOYEE,
-                INSERT_EMPLOYEE_INPUT,
-                INSERT_EMPLOYEE_CONFIRM,
-                INSERT_EMPLOYEE,
-                SHOW_MENU,
-                SELECT_EMPLOYEE_INFO,
-                SELECT_EMPLOYEE_INFO_FORM_EMPTY,
-                SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT,
-                SELECT_DEPARTMENT              
-            
-        );
-    }
-
-    /**
-     * 一般向けのページリストを返す
-     *
-     * @return 一般向けのページリスト
-     */
-    public static Set<String> getUserPageList() {
-        return Set.of(
-                INDEX_BLANK,
-                INDEX_SLASH,
-                INDEX_LOGIN,
-                LOGOUT,
-                DO_LOGIN,
-                PERSONAL_UPDATE_RESULT,
-                SHOW_DEPARTMENT
-        );
-    }
+	/**
+	 * 一般向けのページリストを返す
+	 *
+	 * @return 一般向けのページリスト
+	 */
+	public static Set<String> getUserPageList() {
+		return Set.of(
+				INDEX_BLANK,
+				INDEX_SLASH,
+				INDEX_LOGIN,
+				LOGOUT,
+				DO_LOGIN,
+				PERSONAL_UPDATE_RESULT);
+	}
 
 }

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

@@ -1,17 +1,15 @@
 package com.example.rhizome.app.presentation.form;
 
-import java.util.List;
-
 import com.example.rhizome.app.domain.model.Department;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * 画面の表示に使う部署コード管理用のクラス
  */
-//            部署のフォーム
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

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

@@ -6,21 +6,46 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-//          部署の検索条件
+/**
+ * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
+ */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class SearchConditionDepartmentForm {
-	//部署ID
+
+	/**
+	 * 部署ID
+	 */
 	private Integer idDepartment;
-	//部署名
+	/**
+	 * 部署名
+	 */
 	private String nmDepartment;
-	
-	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm form) {
-		//SearchConditonDepartment();の中身：Formの2つの値を返す
+
+	/**
+	 * business 層の SearchConditionDepartment クラスから画面用（presentation 層）の SearchConditionDepartmentForm に
+	 * 変換します。
+	 *
+	 * @param searchConditionDepartment business 層の SearchConditionDepartment インスタンス
+	 * @return 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
+	 */
+	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
+		return new SearchConditionDepartmentForm(
+				searchConditionDepartment.getIdDepartment(),
+				searchConditionDepartment.getNmDepartment());
+	}
+
+	/**
+	 * 画面用（presentation 層）の SearchConditionDepartmentForm クラスから business 層の SearchConditionDepartment クラスに
+	 * 変換します。
+	 *
+	 * @param searchConditionDepartmentForm 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
+	 * @return business 層の SearchConditionDepartment インスタンス
+	 */
+	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/UpdateDepartmentInfoForm.java

@@ -0,0 +1,91 @@
+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 {
+
+	/**
+	 * 	部署ID
+	 */
+	private Integer idDepartment;
+	/**
+	 * 部署名
+	 */
+	private String nmDepartment;
+
+	/**
+	 * business 層の Department クラスから画面用（presentation 層）の UpdateDepartmentInfoForm に
+	 * 変換します。
+	 *
+	 * @param department business 層の Department インスタンス
+	 * @return 画面用（presentation 層）の UpdateDepartmentInfoForm インスタンス
+	 */
+	public static UpdateDepartmentInfoForm convertFrom(Department department) {
+		return new UpdateDepartmentInfoForm(
+				department.getIdDepartment(),
+				department.getNmDepartment());
+	}
+
+	/**
+	 * business 層の Department クラスから画面用（presentation 層）の UpdateDepartmentInfoForm に
+	 * 変換します。（リスト版）
+	 *
+	 * @param departmentList business 層の Department インスタンスのリスト
+	 * @return 画面用（presentation 層）の UpdateDepartmentInfoForm インスタンスのリスト
+	 */
+	public static List<UpdateDepartmentInfoForm> convertFrom(List<Department> departmentList) {
+		return departmentList.stream().map(UpdateDepartmentInfoForm::convertFrom).toList();
+	}
+
+	/**
+	 * 画面用（presentation 層）の UpdateDepartmentInfoForm クラスから business 層の Department クラスに
+	 * 変換します。
+	 *
+	 * @param updateDepartmentInfoForm 画面用（presentation 層）の UpdateDepartmentInfoForm インスタンス
+	 * @return business 層の Department インスタンス
+	 */
+	public static Department convertTo(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+		return new Department(
+				updateDepartmentInfoForm.getIdDepartment(),
+				updateDepartmentInfoForm.getNmDepartment());
+	}
+
+	/**
+	 * 画面から渡ってきたパラメータのチェック
+	 *
+	 * @param updateDepartmentInfoForm 画面から渡ってきたパラメータ
+	 * @return true: エラー無し　false:エラーあり（必須を満たしていない）
+	 */
+	public static boolean hasErrorParameter(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+
+		boolean errorFlag = !isNullOrBlank(updateDepartmentInfoForm.getNmDepartment());
+
+		return errorFlag;
+	}
+
+	/**
+	 * 仮引数を null or 空 判定する
+	 *
+	 * @param str 判定対象の文字列
+	 * @return true:null or 空 false:null or 空 では無い
+	 */
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+		return str.isBlank();
+	}
+
+}

src/main/resources/application.properties

@@ -1,3 +1,3 @@
 spring.datasource.url=jdbc:mysql://localhost:3306/rezodb
-spring.datasource.username=rezouser1
-spring.datasource.password=Rezo_0001
+spring.datasource.username=rezouser
+spring.datasource.password=Rezo_0000

src/main/resources/templates/menu.html

@@ -10,17 +10,6 @@
     <link rel="stylesheet" th:href="@{/css/all.css}">
     <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
     <title>メニュー</title>
-	    <style>
-			.container{
-				width: 100%;
-				overflow: hidden;
-			}
-			.column{
-				width: 48%;
-				float: left;
-				margin: 1%;
-			}
-		</style>
 
 </head>
 
@@ -36,24 +25,23 @@
     <tr>
         <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
         </td>
-        <td class="description">登録済みのユーザ一覧表示と更新、削除を行います。</td>
+        <td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
     </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">登録済みの部署一覧表示と更新、削除を行います。</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:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+        <td class="description">新規で部署追加を行います。</td>
+    </tr>
 
 </table>
 </body>
@@ -81,7 +69,7 @@
     function selectDepartmentSubmit() {
         const form = document.createElement('form');
         form.setAttribute('method', 'post');
-        form.setAttribute('action', 'selectDepartment');
+        form.setAttribute('action', 'selectDepartmentInfo');
 
         // 動的送信用のHidden
         // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない

src/main/resources/templates/selectDepartment.html

@@ -1,84 +1,117 @@
 <!DOCTYPE html>
-<!--<html>   HTML文書の開始タグ-->
-<!--<head>   ページの設定情報を含む部分-->
-<!--<title>  ページのタイトルを指定するタグ-->
-<!--<body>   実際に表示される内容を記述する部分-->
-<!--<h1>     見出し最大サイズ・<p>段落の基本タグ-->
-<!--<div>    汎用のブロック要素　複数の要素をまとめてレイアウトするためのコンテナ-->
-<!--<table>	 表全体を囲む-->
-<!--<tr>     行全体を囲む-->
-<!--<th>     行見出しセルを囲む-->
-<!--<td>     行データセルを囲む-->
-<!--<a href ="URL"> 飛び先のURLを指定"> -->
-	
-	
 <html xmlns:th="http://www.thymeleaf.org">
+
 <head>
+
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+    <!-- 外部のスクリプトファイルを読み込む -->
     <script th:src="@{/js/common.js}"></script>
+    <!-- CSSの読み込み -->
     <link rel="stylesheet" th:href="@{/css/all.css}">
     <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>部署検索</title>
+    <title>検索</title>
+
 </head>
 <body>
 <h1>
-    部署検索条件入力　　　
+    検索条件入力　　　
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
     </div>
 </h1>
+<form action="selectDepartmentInfo"
+      method="post"
+      th:object="${searchConditionDepartmentForm}">
 
-<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
     <div class="msgBox error" th:if="${messageError} != null">
         <span class="error" th:text="${messageError.message}"></span>
     </div>
     <table>
         <tr>
             <th class="header">部署ID</th>
-            <td><input placeholder="部署ID" th:field="*{idDepartment}" type="number"/></td>
+            <td>
+                <input placeholder="部署ID"
+                       th:field="*{idDepartment}"
+                       type="number"/>
+            </td>
         </tr>
         <tr>
             <th class="header">部署名</th>
-            <td><input type="text" th:field="*{nmDepartment}"></td>
+            <td>
+                <input placeholder="部署名"
+                       th:field="*{nmDepartment}"
+                       type="text"/>
+            </td>
         </tr>
+        
         <tr>
-            <td class="btnArea" colspan="2"><input type="submit" value="検索"/></td>
-            <td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
+            <td class="btnArea" colspan="2">
+                <input type="submit" value="検索"/>
+            </td>
+            <td class="btnArea" colspan="2">
+                <button onclick="clearInput()">クリア</button>
+            </td>
         </tr>
     </table>
 </form>
-
+<div class="header-spacing"></div>
 <a href="showMenu">メニューに戻る</a>
+<div class="header-spacing"></div>
 <h1><span>検索結果</span></h1>
-
-<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
-
-<!--<table th:if="${departmentFormList != null and !departmentFromList.isEmpty()}">-->
-
-	<table th:each="departmentForm : ${departmentFormList}">
-
-<tr>
-	<th>部署ID</th>
-	<th>部署名</th>
-</tr>
-<!--    <tr th:each="department:${departmentFormList}">-->
-	    <td th:text="${departmentForm.idDepartment}"></td>
-	    <td th:text="${departmentForm.nmDepartment}"></td>
-    </tr>
-</table>
-
-<p th:if="${departmentFormList != null and departmentFormList.isEmpty()}">
-	検索結果はありません。
-</p>
-
+<div class="header-spacing"></div>
+<th:block th:if="${messageInfo != null}">
+    <script th:inline="javascript">
+        alert([[${messageInfo.message}]]);
+    </script>
+</th:block>
+<div class="header-spacing"></div>
+<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+    <!-- 検索結果が1件以上ある場合 -->
+    <table class="table-grid table-striped table-hover">
+        <thead>
+        <tr>
+            <th style="width: 60px;">部署ID</th>
+            <th style="width: 100px;">部署名</th>
+            <th style="width: 150px;">操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr th:each="departmentInfoForm : ${departmentFormList}">
+			
+            <td th:text="${departmentInfoForm.idDepartment}"></td>
+            <td th:text="${departmentInfoForm.nmDepartment}"></td>
+            <td>
+                <!-- 更新フォーム -->
+                <form action="showUpdateDepartment" method="post" style="display: inline;">
+                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
+                    <input type="submit" value="更新">
+                </form>
+                <!-- 削除フォーム -->
+                <form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
+                      style="display: inline;">
+                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
+                    <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 = '';
-        // ★部署名の入力欄も空にする（id は th:field が自動で作る）
-		
+        document.getElementById('nmDepartment').value = '';
+        document.getElementById('idDepartment').selectedIndex = 0;
     }
+
+
 </script>
 </html>

src/main/resources/templates/updateDepartmentInput.html

@@ -0,0 +1,88 @@
+<!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="/updateDepartmentResult"
+      method="post"
+      onsubmit="return confirm('本当によろしいですか？');"
+      th:object="${departmentFormList}"
+ > 
+    <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"
+                           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>
+        </tr>
+    </table>
+</form>
+<a href="javascript:selectSubmit()">一覧に戻る</a>
+</body>
+
+<script>
+    function selectSubmit() {
+        const form = document.createElement('form');
+        form.setAttribute('method', 'post');
+        form.setAttribute('action', 'departmentAll');
+
+        // 動的送信用のHidden
+        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+        const inputField = document.createElement("input");
+        inputField.setAttribute("type", "hidden");
+        inputField.setAttribute("value", "departmentAll");
+
+        form.appendChild(inputField);
+
+        // フォームをDOMに追加
+        document.body.appendChild(form);
+
+        form.submit();
+    }
+
+</script>
+</html>