コメントの修正

社員のものからコピーしたままになっていたので部署に合うように変更
第3段階部署更新機能
2026-10-14 16:33:42 +09:00 · 2026-10-14 15:48:42 +09:00 · 2026-10-13 16:26:40 +09:00 · 2026-10-13 10:23:24 +09:00
44 changed files with 1101 additions and 1086 deletions
--- a/.classpath
+++ b/.classpath
@@ -1,41 +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 excluding="**" 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="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" 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="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>
--- a/.gitignore
+++ b/.gitignore
@@ -1 +0,0 @@
-/target/
--- a/.project
+++ b/.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>
--- a/.settings/.jsdtscope
+++ b/.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>
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.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
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.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
--- a/.settings/org.eclipse.wst.common.component
+++ b/.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>
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.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>
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -1 +0,0 @@
-Window
--- a/.settings/org.eclipse.wst.validation.prefs
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
--- a/src/main/java/com/example/rhizome/aop/aspect/PermissionCheckAspect.java
+++ b/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
@@ -111,4 +112,3 @@ public class PermissionCheckAspect {

 	}
 }
-
--- a/src/main/java/com/example/rhizome/app/domain/service/DeleteDepartment.java
+++ b/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);
+
 }
--- a/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java
@@ -1,14 +1,17 @@
 package com.example.rhizome.app.domain.service;

+import java.util.List;
+
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;

-import java.util.List;
-
 public interface SearchDepartment {
 	List<Department> selectAll();

 	List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);

 	List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
+
+	Department searchDepartmentByIdDepartment(Integer idDepartment);
+
 }
--- a/src/main/java/com/example/rhizome/app/domain/service/UpdateDepartment.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/UpdateDepartment.java
@@ -3,6 +3,6 @@ package com.example.rhizome.app.domain.service;
 import com.example.rhizome.app.domain.model.Department;

 public interface UpdateDepartment {
-	void updateDepartment(Department depart);
+	void updateDepartment(Department beforeDepartment, Department updateDepartment);

 }
--- a/src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDepartmentImpl.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDepartmentImpl.java
@@ -12,20 +12,19 @@ import com.example.rhizome.app.infra.repository.DepartmentRepository;
 */
@Service
@Transactional
-public class DeleteDeparmentImpl implements DeleteDepartment{
+public class DeleteDepartmentImpl implements DeleteDepartment {
+
 	DepartmentRepository departmentRepository;

 	@Autowired
-    public DeleteDeparmentImpl(DepartmentRepository departmentRepository) {
+	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
 		this.departmentRepository = departmentRepository;
-
 	}

-
 	/**
 	 * idDepartment を元に department データを削除
 	 *
-	 * @param idDepartmetn 削除対象のidDepartment
+	 * @param idDepartment 削除対象のidDepartment
 	 */
 	public void deleteDepartment(Integer idDepartment) {
 		departmentRepository.deleteById(idDepartment);
--- a/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java
@@ -1,17 +1,17 @@
 package com.example.rhizome.app.domain.service.impl;

+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;

 /**
 * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -53,10 +53,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()))));

 	}

@@ -73,10 +73,16 @@ 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()))));

 	}
+
+	//idDepartmentに合致するレコード取得
+	public Department searchDepartmentByIdDepartment(Integer idDepartment) {
+		return DepartmentEntity
+				.createDepartment(departmentRepository.findByIdDepartment(idDepartment).orElse(new DepartmentEntity()));
+	}
 }
--- a/src/main/java/com/example/rhizome/app/domain/service/impl/UpdateDepartmentImpl.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/impl/UpdateDepartmentImpl.java
@@ -9,6 +9,9 @@ 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 {
@@ -20,10 +23,31 @@ public class UpdateDepartmentImpl implements UpdateDepartment {
 		this.departmentRepository = departmentRepository;
 	}

-	public void updateDepartment(Department department) {
-		DepartmentEntity entity = new DepartmentEntity();
-		entity.setIdDepartment(department.getIdDepartment());
-		entity.setNmDepartment(department.getNmDepartment());
-		departmentRepository.save(entity);
+	/**
+	 * 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());
+
+	}
+
 }
--- a/src/main/java/com/example/rhizome/app/domain/service/searchDepartmentinfo.java
+++ b/src/main/java/com/example/rhizome/app/domain/service/searchDepartmentinfo.java
@@ -1,17 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-import java.util.List;
-
-import com.example.rhizome.app.domain.model.EmployeeInfo;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
-public interface searchDepartmentinfo {
-	List<EmployeeInfo> selectAll();
-
-    static List<EmployeeInfo> searchBy(SearchConditionDepartment searchConditionDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-}
-
-
--- a/src/main/java/com/example/rhizome/app/infra/entity/DepartmentEntity.java
+++ b/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
 *
@@ -53,8 +60,8 @@ public class DepartmentEntity {
 				.stream()
 				.map(departmentEntity -> new Department(
 						departmentEntity.getIdDepartment(),
-                        departmentEntity.getNmDepartment()
-                )).toList();
+						departmentEntity.getNmDepartment()))
+				.toList();
 	}

 	/**
@@ -66,7 +73,20 @@ public class DepartmentEntity {
 	public static DepartmentEntity convertFrom(Department department) {
 		return new DepartmentEntity(
 				department.getIdDepartment(),
-                department.getNmDepartment()
-        );
+				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());
+	}
+
 }
--- a/src/main/java/com/example/rhizome/app/infra/repository/DepartmentRepository.java
+++ b/src/main/java/com/example/rhizome/app/infra/repository/DepartmentRepository.java
@@ -1,11 +1,13 @@
 package com.example.rhizome.app.infra.repository;

-import com.example.rhizome.app.infra.entity.DepartmentEntity;
+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;

+import com.example.rhizome.app.infra.entity.DepartmentEntity;

 /**
 * Specification:
@@ -20,12 +22,11 @@ import org.springframework.stereotype.Repository;
 * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
 */
@Repository
-public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
-
+public interface DepartmentRepository
+		extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {

 	static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-        return idDepartment == null ?
-                null :
+		return idDepartment == null ? null :
 		// 戻り値の型 Specification<DepartmentEntity> にキャスト
 				(Specification<DepartmentEntity>)
 				// ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
@@ -34,17 +35,22 @@ public interface DepartmentRepository extends JpaRepository<DepartmentEntity, In
 	}

 	static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
-        return (nmDepartment == null || nmDepartment.isEmpty()) ?
-                null :
-                (Specification<DepartmentEntity>)
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), 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 + "%");
+		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);
+
 }
--- a/src/main/java/com/example/rhizome/app/presentation/controller/DeleteDepartmentController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/DeleteDepartmentController.java
@@ -2,7 +2,6 @@ package com.example.rhizome.app.presentation.controller;

 import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;

-import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;

@@ -24,24 +23,20 @@ import com.example.rhizome.app.domain.service.SearchEmployee;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;

 /**
- * 削除処理のコントロータ
+ * 削除処理のコントローラ
 */
@Controller
 public class DeleteDepartmentController {
-
 	// ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());

 	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-	final String UNKNOWN_ID = "削除対象のIDが不明です。";
-	final String DELETE_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除できません。";
-	final String DELETE_COMPLETE = "削除しました。";

 	HttpSession httpSession;
 	DeleteDepartment deleteDepartment;
@@ -68,20 +63,12 @@ public class DeleteDepartmentController {
 	@SessionCheck
 	@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
 	public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-
 		try {
-			if (idDepartment == null) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, UNKNOWN_ID);
-				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
-				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-			} else {
-
 			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
 			// 作成した部署一覧をセット
 			model.addAttribute(
 					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));

 			// 削除処理実施
 			deleteExec(
@@ -91,7 +78,7 @@ public class DeleteDepartmentController {

 			// 検索画面に遷移
 			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
-			}
+
 		} catch (Exception e) {
 			// ログイン情報の破棄
 			httpSession.invalidate();
@@ -111,22 +98,25 @@ public class DeleteDepartmentController {
 	 * @param idDepartment 削除対象のdepartmentId
 	 * @param loginUser  ログインユーザー情報
 	 */
-
 	private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {

-		// 1名以上が所属している場合
-		if (loginUser != null && Objects.equals(loginUser.getIdDepartment(), idDepartment)) {
-			// 削除対象だった場合
+		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(DELETE_TARGET_ID_CAN_NOT_DELETE));
-			// 検索画面に遷移
+			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));
--- a/src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java
@@ -9,7 +9,7 @@ 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.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ public class DeleteEmployeeController {
            // 作成した部署一覧をセット
            model.addAttribute(
                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
            );

            // 削除処理実施
--- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java
@@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
 import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,7 +75,7 @@ public class InsertEmployeeConfirmController {
            // 作成した部署一覧をセット
            model.addAttribute(
                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(
+                    DepartmentForm.convertFrom(
                            searchDepartment.selectAll()
                    ));

--- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java
@@ -8,7 +8,7 @@ import com.example.rhizome.app.domain.service.impl.RegisterEmployeeImpl;
 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.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +71,7 @@ public class InsertEmployeeController {
            // 作成した部署一覧をセット
            model.addAttribute(
                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(
+                    DepartmentForm.convertFrom(
                            searchDepartment.selectAll()
                    ));

--- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeInputController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeInputController.java
@@ -6,7 +6,7 @@ import com.example.rhizome.app.domain.service.RegisterEmployee;
 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.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -64,7 +64,7 @@ public class InsertEmployeeInputController {

        try {
            // 部署コードリストを作成し、画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));

            // パラメータをセット
            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
--- a/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java
@@ -18,11 +18,15 @@ 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.DepartmentInfoForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartment;
+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());
 	// エラーメッセージ用の定数フィールド
@@ -41,41 +45,40 @@ public class SelectDepartmentController {
 	}

 	@ModelAttribute
-	public SearchConditionDepartment searchConditionDepartment() {
-		return new SearchConditionDepartment();
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+		return new SearchConditionDepartmentForm();
 	}

 	/**
 	 * 社員検索画面表示処理コントローラ
 	 *
-	 * @param searchConditionDepartment 検索画面のフォーム
+	 * @param searchConditionDepartmentForm 検索画面のフォーム
 	 * @param model                       ビューにデータを渡すためのコンテナ
 	 * @return 遷移先の画面
 	 */
 	@PermissionCheck
 	@SessionCheck
 	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-	public String select(SearchConditionDepartment searchConditionDepartment, Model model) {
-
+	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
 		try {

 			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
 			// 作成した部署一覧をセット
 			model.addAttribute(
 					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));

 			// 検索条件を元に検索を実施
-			// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(
-					searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment))));
+			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();

 			// エラーログ出力
@@ -83,6 +86,7 @@ public class SelectDepartmentController {
 			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
+
 	}

 	/**
@@ -101,14 +105,10 @@ public class SelectDepartmentController {
 		// 作成した部署一覧をセット
 		model.addAttribute(
 				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
-
-		// 検索条件を元に検索を実施
-		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentInfoForm.convertFrom(
-						searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment()))));
+				DepartmentForm.convertFrom(searchDepartment.selectAll()));

 		// 検索ページに遷移
 		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
 	}
+
 }
--- a/src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java
@@ -1,26 +1,24 @@
 package com.example.rhizome.app.presentation.controller;

-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.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.DepartmentInfoForm;
+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;

 /**
 * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -67,10 +65,11 @@ public class SelectEmployeeController {
            // 作成した部署一覧をセット
            model.addAttribute(
                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
            );

            // 検索条件を元に検索を実施
+            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
            model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
            // 検索ページに遷移
            return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
@@ -106,7 +105,7 @@ public class SelectEmployeeController {
        // 作成した部署一覧をセット
        model.addAttribute(
                PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                DepartmentForm.convertFrom(searchDepartment.selectAll())
        );

        // 検索条件を元に検索を実施
--- a/src/main/java/com/example/rhizome/app/presentation/controller/UpdateDepartmentController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/UpdateDepartmentController.java
@@ -1,6 +1,5 @@
 package com.example.rhizome.app.presentation.controller;

-import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;

@@ -16,59 +15,57 @@ import org.springframework.web.bind.annotation.RequestParam;

 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployee;
-import com.example.rhizome.app.domain.service.UpdateDepartment;
+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.MessageForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartment;
-import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
+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(DeleteDepartmentController.class.getName());

-	private static final String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";

 	HttpSession httpSession;
-	UpdateDepartment updateDepartment;
 	SearchDepartment searchDepartment;
-	SearchEmployee searchEmployee;
+	SearchEmployeeInfo searchEmployeeInfo;

 	@Autowired
-	public UpdateDepartmentController(UpdateDepartment updateDepartment, SearchDepartment searchDepartment,
-			HttpSession httpSession, SearchEmployee searchEmployee) {
+	public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
 		this.httpSession = httpSession;
-		this.updateDepartment = updateDepartment;
 		this.searchDepartment = searchDepartment;
-		this.searchEmployee = searchEmployee;
+		this.searchEmployeeInfo = searchEmployeeInfo;
 	}

 	@ModelAttribute
-	public SearchConditionDepartment searchConditionDepartment() {
-		return new SearchConditionDepartment();
+	public SearchConditionEmployeeForm searchConditionEmployeeForm() {
+		return new SearchConditionEmployeeForm();
 	}

+	/**
+	 * 更新対象の department が存在するか確認する為のコントローラ
+	 *
+	 * @param idDepartment 更新対象の employee の id
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
 	@PermissionCheck
 	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DEPARTMENT, method = RequestMethod.POST)
-	public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+	@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 {
-			List<Department> departmentList = searchDepartment
-					.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(idDepartment, null));
-			if (departmentList.isEmpty()) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
-				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO;
-			}
-			// 更新画面に遷移
-			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM,
-					UpdateDepartmentForm.convertFrom(departmentList.get(0)));
+			// 部署一覧を取得し画面に返す値としてセット
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.searchDepartmentByIdDepartment(idDepartment)));

 			// Update画面に遷移
 			return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
@@ -82,57 +79,7 @@ public class UpdateDepartmentController {
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
 			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}

 		}
-
-	@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 {
-
-			boolean bo = updateDepartmentForm.hasRequiredValue();
-			if (bo == false) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(NOTHING));
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-			List<Department> departmentList = searchDepartment
-					.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(null,
-							updateDepartmentForm.getNmDepartment()));
-			if (departmentList == null && departmentList.isEmpty()){
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(DUPLICATION));
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-			List<Department> departmentList2 = searchDepartment
-					.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(
-							updateDepartmentForm.getIdDepartment(), null));
-			if (departmentList2 == null || departmentList2.isEmpty()) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(NO_TARGET));
-				return PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM;
-			}
-			Department department = new Department(updateDepartmentForm.getIdDepartment(),
-					updateDepartmentForm.getNmDepartment());
-			updateDepartment.updateDepartment(department);
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO,
-					new MessageForm(UPDATE_COMPLETE));
-			return PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM;
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-
-			e.printStackTrace();
-
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
 	}
 }
--- a/src/main/java/com/example/rhizome/app/presentation/controller/UpdateDepartmentResultController.java
+++ b/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;
+		}
+
+	}
+
+}
--- a/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeController.java
@@ -8,7 +8,7 @@ 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.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -67,7 +67,7 @@ public class UpdateEmployeeController {

        try {
            // 部署一覧を取得し画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));

            // id を条件に更新対象のレコードを検索、取得する
            List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy(
--- a/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeResultController.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeResultController.java
@@ -11,7 +11,7 @@ import com.example.rhizome.app.domain.service.UpdateEmployee;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -91,7 +91,7 @@ public class UpdateEmployeeResultController {
        try {

            // 部署一覧取得
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));

            // パスワードが仕様を満たしているか確認
            String error = UpdateEmployeeInfoForm.validatePassword(
--- a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java
@@ -10,10 +10,11 @@ public class PageReturnAttributeKeyword {

 	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 = "updateDepartmentForm";
+	public static final String UPDATE_DEPARTMENT_INFO_FORM = "updateDepartmentInfoForm";

 }
--- a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java
+++ b/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java
@@ -21,9 +21,9 @@ public class TransitionTargetPageNameKeyword {
 	public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
 	public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
 	public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
-	public static final String SELECT_DEPARTMENT_HTML = "/selectDepartment";
+
 	public static final String ERROR_HTML = "error";
-	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
+
 	// 共通(Controller)
 	public static final String INDEX_BLANK = "";
 	public static final String INDEX_SLASH = "/";
@@ -44,10 +44,19 @@ public class TransitionTargetPageNameKeyword {
 	public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
 	public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
 	public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
+
+	// 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 SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
+	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";

 	/**
@@ -63,6 +72,7 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
+				DELETE_EMPLOYEE,
 				INSERT_EMPLOYEE_INPUT,
 				INSERT_EMPLOYEE_CONFIRM,
 				INSERT_EMPLOYEE,
@@ -74,7 +84,7 @@ public class TransitionTargetPageNameKeyword {
 				SELECT_DEPARTMENT_INFO,
 				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
 				DELETE_DEPARTMENT,
-				SHOW_UPDATE_DEPARTMENT,
+				SHOW_UPDATE_DAPERTMENT,
 				UPDATE_DEPARTMENT_RESULT);
 	}

--- a/src/main/java/com/example/rhizome/app/presentation/form/DepartmentInfoForm.java
+++ b/src/main/java/com/example/rhizome/app/presentation/form/DepartmentInfoForm.java
@@ -13,7 +13,7 @@ import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class DepartmentInfoForm {
+public class DepartmentForm {
    /**
     * 部署ID
     */
@@ -30,8 +30,8 @@ public class DepartmentInfoForm {
     * @param department business 層の Department インスタンス
     * @return 画面用（presentation 層）の DepartmentForm インスタンス
     */
-    public static DepartmentInfoForm convertFrom(Department department) {
-        return new DepartmentInfoForm(department.getIdDepartment(), department.getNmDepartment());
+    public static DepartmentForm convertFrom(Department department) {
+        return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
    }

    /**
@@ -41,7 +41,7 @@ public class DepartmentInfoForm {
     * @param departmentList business 層の Department インスタンスのリスト
     * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト
     */
-    public static List<DepartmentInfoForm> convertFrom(List<Department> departmentList) {
-        return departmentList.stream().map(DepartmentInfoForm::convertFrom).toList();
+    public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
+        return departmentList.stream().map(DepartmentForm::convertFrom).toList();
    }
 }
--- a/src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartment.java
+++ b/src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartment.java
@@ -1,50 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SearchConditionDepartment {
-	/**
-	 * 部署ID
-	 */
-	private Integer idDepartment;
-	/**
-	 * 部署名
-	 */
-	private String nmDepartment;
-
-	/**
-	 * business 層の SearchConditionDepartment クラスから画面用（presentation 層）の SearchConditionDepartement に
-	 * 変換します。
-	 *
-	 * @param searchConditionDepartement business 層の SearchConditionDepartment インスタンス
-	 * @return 画面用（presentation 層）の SearchConditionDepartment インスタンス
-	 */
-	public static SearchConditionDepartment convertFrom(
-			com.example.rhizome.app.domain.model.SearchConditionDepartment searchConditionDepartment) {
-		return new SearchConditionDepartment(
-				searchConditionDepartment.getIdDepartment(),
-				searchConditionDepartment.getNmDepartment());
-	}
-
-	/**
-	 * 画面用（presentation 層）の SearchConditionDepartement クラスから business 層の SearchConditionDepartement クラスに
-	 * 変換します。
-	 *
-	 * @param searchConditionDepartement 画面用（presentation 層）の SearchConditionDepartement インスタンス
-	 * @return business 層の SearchConditionDepartement インスタンス
-	 */
-	public static com.example.rhizome.app.domain.model.SearchConditionDepartment convertTo(
-			SearchConditionDepartment searchConditionDepartment) {
-		return new com.example.rhizome.app.domain.model.SearchConditionDepartment(
-				searchConditionDepartment.getIdDepartment(),
-				searchConditionDepartment.getNmDepartment());
-	}
-}
--- a/src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartmentForm.java
+++ b/src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartmentForm.java
@@ -0,0 +1,51 @@
+package com.example.rhizome.app.presentation.form;
+
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SearchConditionDepartmentForm {
+
+	/**
+	 * 部署ID
+	 */
+	private Integer idDepartment;
+	/**
+	 * 部署名
+	 */
+	private String nmDepartment;
+
+	/**
+	 * business 層の SearchConditionDepartment クラスから画面用（presentation 層）の SearchConditionDepartmentForm に
+	 * 変換します。
+	 *
+	 * @param searchConditionDepartment business 層の SearchConditionDepartment インスタンス
+	 * @return 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
+	 */
+	public static SearchConditionDepartmentForm 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(
+				searchConditionDepartmentForm.getIdDepartment(),
+				searchConditionDepartmentForm.getNmDepartment());
+	}
+}
--- a/src/main/java/com/example/rhizome/app/presentation/form/UpdateDepartmentForm.java
+++ b/src/main/java/com/example/rhizome/app/presentation/form/UpdateDepartmentForm.java
@@ -1,48 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import com.example.rhizome.app.domain.model.Department;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UpdateDepartmentForm {
-
-	//部署ID
-	private Integer idDepartment;
-	//部署名
-	private String nmDepartment;
-
-	/**
-	 * business 層の Department クラスから画面用（presentation 層）の UpdateDepartmentForm に
-	 * 変換します。
-	 *
-	 * @param departmentInfo business 層の DepartmentInfo インスタンス
-	 * @return 画面用（presentation 層）の UpdateDepartmentForm インスタンス
-	 */
-	public static UpdateDepartmentForm convertFrom(Department department) {
-		return new UpdateDepartmentForm(department.getIdDepartment(), department.getNmDepartment());
-	}
-
-	/**
-	 * 画面用（presentation 層）の UpdateDepartmentForm クラスから business 層の Department クラスに
-	 * 変換します。
-	 *
-	 * @param updateDepartmentForm 画面用（presentation 層）の UpdateDepartmentForm インスタンス
-	 * @return business 層の Department インスタンス
-	 */
-	public static Department convertTo(UpdateDepartmentForm form) {
-		return new Department(form.getIdDepartment(), form.getNmDepartment());
-	}
-
-	public boolean hasRequiredValue() {
-		if (idDepartment == null && (nmDepartment == null || nmDepartment.isBlank())) {
-			return false;
-		} else {
-			return true;
-		}
-	}
-}
--- a/src/main/java/com/example/rhizome/app/presentation/form/UpdateDepartmentInfoForm.java
+++ b/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();
+	}
+
+}
--- a/src/main/resources/templates/menu.html
+++ b/src/main/resources/templates/menu.html
@@ -26,18 +26,22 @@
        <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>
    </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><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
        <td class="description">新規で部署追加を行います。</td>
-
+    </tr>

 </table>
 </body>
--- a/src/main/resources/templates/selectDepartment.html
+++ b/src/main/resources/templates/selectDepartment.html
@@ -2,6 +2,7 @@
 <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>
@@ -11,7 +12,6 @@
    <title>検索</title>

 </head>
-
 <body>
 <h1>
    検索条件入力　　　
@@ -20,26 +20,31 @@
        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
    </div>
 </h1>
-
-	<form action="selectDepartmentInfo" method="post" th:object="${searchConditionDepartment}">
+<form action="selectDepartmentInfo"
+      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" />
+                <input placeholder="部署ID"
+                       th:field="*{idDepartment}"
+                       type="number"/>
            </td>
        </tr>
        <tr>
            <th class="header">部署名</th>
            <td>
-					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+                <input placeholder="部署名"
+                       th:field="*{nmDepartment}"
+                       type="text"/>
            </td>
        </tr>
+        
        <tr>
            <td class="btnArea" colspan="2">
                <input type="submit" value="検索"/>
@@ -50,7 +55,6 @@
        </tr>
    </table>
 </form>
-
 <div class="header-spacing"></div>
 <a href="showMenu">メニューに戻る</a>
 <div class="header-spacing"></div>
@@ -69,27 +73,26 @@
        <tr>
            <th style="width: 60px;">部署ID</th>
            <th style="width: 100px;">部署名</th>
-					<th style="width: 60px;">操作</th>
+            <th style="width: 150px;">操作</th>
        </tr>
-</body>
        </thead>
        <tbody>
-	<tr th:each="departmentForm : ${departmentFormList}">
-		<td th:text="${departmentForm.idDepartment}"></td>
-		<td th:text="${departmentForm.nmDepartment}"></td>
+        <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="${departmentForm.idDepartment}" type="hidden">
+                    <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="${departmentForm.idDepartment}" type="hidden">
+                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
                    <input type="submit" value="削除">
                </form>
-
            </td>
        </tr>
        </tbody>
@@ -106,7 +109,9 @@
    function clearInput() {
        document.getElementById('idDepartment').value = '';
        document.getElementById('nmDepartment').value = '';
+        document.getElementById('idDepartment').selectedIndex = 0;
    }
-</script>

+
+</script>
 </html>
--- a/src/main/resources/templates/updateDepartmentForm.html
+++ b/src/main/resources/templates/updateDepartmentForm.html
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-
-	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-	<!-- 外部のスクリプトファイルを読み込む -->
-	<script th:src="@{/js/common.js}"></script>
-	<!-- CSSの読み込み -->
-	<link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>部署情報更新</title>
-</head>
-
-<body>
-	<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="${updateDepartmentForm}">
-
-		<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 class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
-					<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-						type="text" />
-				</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>
--- a/src/main/resources/templates/updateDepartmentInput.html
+++ b/src/main/resources/templates/updateDepartmentInput.html
@@ -20,33 +20,50 @@
        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
    </div>
 </h1>
-	<form action="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-		th:object="${updateDepartmentForm}">
-
+<form action="/updateDepartmentResult"
+      method="post"
+      onsubmit="return confirm('本当によろしいですか？');"
+      th:object="${departmentFormList}"
+ > 
    <div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:text="${messageError.message}"></span>
+        <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
    </div>
    <table>
        <tr>
            <th class="header">部署ID</th>
            <td>
-					<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
+                <label>
+                    <input class="readOnly"
+                           readonly="readonly"
+                           th:field="*{idDepartment}"
+                           type="text"
+                    />
+                </label>
            </td>
        </tr>
        <tr>
            <th class="header">部署名</th>
            <td>
-					<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-						type="text" />
+                <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() {
        const form = document.createElement('form');
@@ -66,6 +83,6 @@

        form.submit();
    }
-	</script>

+</script>
 </html>
--- a/src/main/resources/templates/updateEmployeeInput.html
+++ b/src/main/resources/templates/updateEmployeeInput.html
@@ -20,8 +20,11 @@
        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
    </div>
 </h1>
-	<form action="/updateEmployeeResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-		th:object="${updateEmployeeInfoForm}">
+<form action="/updateEmployeeResult"
+      method="post"
+      onsubmit="return confirm('本当によろしいですか？');"
+      th:object="${updateEmployeeInfoForm}"
+>
    <div class="msgBox error" th:if="${messageError != null}">
        <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
    </div>
@@ -30,7 +33,11 @@
            <th class="header">社員ID</th>
            <td>
                <label>
-						<input class="readOnly" readonly="readonly" th:field="*{idEmployee}" type="text" />
+                    <input class="readOnly"
+                           readonly="readonly"
+                           th:field="*{idEmployee}"
+                           type="text"
+                    />
                </label>
            </td>
        </tr>
@@ -38,8 +45,12 @@
            <th class="header">社員名</th>
            <td>
                <label>
-						<input maxlength="50" placeholder="社員名" required="required" th:field="*{nmEmployee}"
-							type="text" />
+                    <input maxlength="50"
+                           placeholder="社員名"
+                           required="required"
+                           th:field="*{nmEmployee}"
+                           type="text"
+                    />
                </label>
            </td>
        </tr>
@@ -47,8 +58,13 @@
            <th class="header">社員名フリガナ</th>
            <td>
                <label>
-						<input maxlength="50" oninput="convertToKatakana(this)" placeholder="フリガナ" required="required"
-							th:field="*{knEmployee}" type="text" />
+                    <input maxlength="50"
+                           oninput="convertToKatakana(this)"
+                           placeholder="フリガナ"
+                           required="required"
+                           th:field="*{knEmployee}"
+                           type="text"
+                    />
                </label>
            </td>
        </tr>
@@ -56,8 +72,12 @@
            <th class="header">メールアドレス</th>
            <td>
                <label>
-						<input maxlength="100" placeholder="メールアドレス" required="required" th:field="*{mailAddress}"
-							type="email" />
+                    <input maxlength="100"
+                           placeholder="メールアドレス"
+                           required="required"
+                           th:field="*{mailAddress}"
+                           type="email"
+                    />
                </label>
            </td>
        </tr>
@@ -65,8 +85,11 @@
            <th class="header">パスワード</th>
            <td>
                <label>
-						<input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$" placeholder="パスワード"
-							th:field="*{password}" type="password" />
+                    <input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$"
+                           placeholder="パスワード"
+                           th:field="*{password}"
+                           type="password"
+                    />
                </label>
            </td>
        </tr>
@@ -85,8 +108,11 @@
            <th class="header">パスワード確認用</th>
            <td>
                <label>
-						<input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$" placeholder="パスワード確認用"
-							th:field="*{passwordConfirm}" type="password" />
+                    <input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$"
+                           placeholder="パスワード確認用"
+                           th:field="*{passwordConfirm}"
+                           type="password"
+                    />
                </label>
            </td>
        </tr>
@@ -95,12 +121,14 @@
            <td>
                <label>
                    <input id="adminAuth1" name="adminAuth" th:checked="${updateEmployeeInfoForm.adminAuth == 1}"
-							type="radio" value="1"> 管理者権限
+                           type="radio"
+                           value="1"> 管理者権限
                </label>
                <label>
                    <input id="adminAuth0" name="adminAuth"
                           th:checked="${updateEmployeeInfoForm.adminAuth == null or updateEmployeeInfoForm.adminAuth == 0}"
-							type="radio" value="0">
+                           type="radio"
+                           value="0">
                    一般権限
                </label>
            </td>
@@ -112,7 +140,8 @@
                    <select required="required" th:field="*{idDepartment}">
                        <option th:each="department : ${departmentFormList}"
                                th:selected="${updateEmployeeInfoForm.idDepartment != null && department.idDepartment == updateEmployeeInfoForm.idDepartment}"
-								th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
+                                th:text="${department.nmDepartment}"
+                                th:value="${department.idDepartment}">
                        </option>
                    </select>
                </label>
@@ -149,5 +178,4 @@
    }

 </script>
-
 </html>
Author	SHA1	Message	Date
s-sakiyama	182f901a4d	コメントの修正社員のものからコピーしたままになっていたので部署に合うように変更	2026-10-14 16:33:42 +09:00
s-sakiyama	0f1141e689	第3段階部署更新機能	2026-10-14 15:48:42 +09:00
s-sakiyama	815d957a31	第2段階　部署削除機能	2026-10-13 16:26:40 +09:00
s-sakiyama	4c134b81b8	第一段階目　部署検索機能	2026-10-13 10:23:24 +09:00
				`@@ -1 +0,0 @@`
				`org.eclipse.wst.jsdt.launching.baseBrowserLibrary`