段階３完了

.classpath

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

.gitignore

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

.project

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,17 +1,16 @@
 package com.example.rhizome.aop.aspect;
 
-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;
 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 com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
+import javax.servlet.http.HttpServletRequest;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.LoginUserForm;
-import com.example.rhizome.exception.InsufficientPermissionException;
 
 /**
  * 権限チェック用のAOP
@@ -112,3 +111,4 @@ public class PermissionCheckAspect {
 
     }
 }
+

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

@@ -2,5 +2,4 @@ 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

@@ -1,17 +1,14 @@
 package com.example.rhizome.app.domain.service;
 
-import java.util.List;
-
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.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);
-
 }

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 beforeDepartment, Department updateDepartment);
+	void updateDepartment(Department depart);
 
-}
+	}

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

@@ -12,19 +12,20 @@ import com.example.rhizome.app.infra.repository.DepartmentRepository;
  */
 @Service
 @Transactional
-public class DeleteDepartmentImpl implements DeleteDepartment {
+public class DeleteDeparmentImpl implements DeleteDepartment{
-
 	DepartmentRepository departmentRepository;
 
 	@Autowired
-	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
+    public DeleteDeparmentImpl(DepartmentRepository departmentRepository) {
 		 this.departmentRepository = departmentRepository;
+
 	}
 
+
 	/**
 	 * idDepartment を元に department データを削除
 	 *
-	 * @param idDepartment 削除対象のidDepartment
+	 * @param idDepartmetn 削除対象のidDepartment
 	 */
 	public void deleteDepartment(Integer idDepartment) {
 		departmentRepository.deleteById(idDepartment);

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
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
-								.and(DepartmentRepository
+                        )
-										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
+                );
 
     }
 
@@ -73,16 +73,10 @@ public class SearchDepartmentImpl implements SearchDepartment {
         return DepartmentEntity
                 .createDepartmentList(
                         departmentRepository.findAll(Specification
-								.where(DepartmentRepository
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
-								.and(DepartmentRepository
+                        )
-										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
+                );
 
     }
-
-	//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

@@ -9,9 +9,6 @@ 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 {
@@ -23,31 +20,10 @@ public class UpdateDepartmentImpl implements UpdateDepartment {
 		this.departmentRepository = departmentRepository;
 	}
 
-	/**
+	public void updateDepartment(Department department) {
-	 * department の情報を元に department table のレコードを更新する
+		DepartmentEntity entity = new DepartmentEntity();
-	 *
+		entity.setIdDepartment(department.getIdDepartment());
-	 * @param beforeDepartment 更新前のデータ
+		entity.setNmDepartment(department.getNmDepartment());
-	 * @param updateDepartment 更新後のデータ
+		departmentRepository.save(entity);
-	 */
-	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/domain/service/searchDepartmentinfo.java

@@ -0,0 +1,17 @@
+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;
+	}
+}
+
+

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

@@ -6,22 +6,15 @@
  */
 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
  *
@@ -60,8 +53,8 @@ public class DepartmentEntity {
                 .stream()
                 .map(departmentEntity -> new Department(
                         departmentEntity.getIdDepartment(),
-						departmentEntity.getNmDepartment()))
+                        departmentEntity.getNmDepartment()
-				.toList();
+                )).toList();
     }
 
     /**
@@ -73,20 +66,7 @@ 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());
-	}
-
 }

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

@@ -1,13 +1,11 @@
 package com.example.rhizome.app.infra.repository;
 
-import java.util.Optional;
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
-
 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:
@@ -22,11 +20,12 @@ import com.example.rhizome.app.infra.entity.DepartmentEntity;
  * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
  */
 @Repository
-public interface DepartmentRepository
+public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
-		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(変数)"
@@ -35,22 +34,17 @@ public interface DepartmentRepository
     }
 
     static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
-		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
+        return (nmDepartment == null || nmDepartment.isEmpty()) ?
-				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+                null :
-						.like(root.get("nmDepartment"), nmDepartment);
+                (Specification<DepartmentEntity>)
+                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), nmDepartment);
     }
 
+
     static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
-		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
+        return (nmDepartment == null || nmDepartment.isEmpty()) ?
-				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+                null :
-						.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
+                (Specification<DepartmentEntity>)
+                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
     }
-
-	static void deleteBy(Integer id) {
-
-	}
-
-	//idで検索
-	Optional<DepartmentEntity> findByIdDepartment(Integer idDepartment);
-
 }

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

@@ -2,6 +2,7 @@ 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;
 
@@ -23,20 +24,24 @@ 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.DepartmentInfoForm;
 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;
@@ -63,12 +68,20 @@ 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,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+						DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
 				// 削除処理実施
 				deleteExec(
@@ -78,7 +91,7 @@ public class DeleteDepartmentController {
 
 				// 検索画面に遷移
 				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
-
+			}
 		} catch (Exception e) {
 			// ログイン情報の破棄
 			httpSession.invalidate();
@@ -98,25 +111,22 @@ public class DeleteDepartmentController {
 	 * @param idDepartment 削除対象のdepartmentId
 	 * @param loginUser  ログインユーザー情報
 	 */
+
 	private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
 
-		final String DELETE_COMPLETE = "削除しました。";
+		// 1名以上が所属している場合
-		final String ID_TO_DELETED_IS_UNKNOWN = "削除対象のIDが不明です。";
+		if (loginUser != null && Objects.equals(loginUser.getIdDepartment(), idDepartment)) {
-		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));
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
+			// 検索画面に遷移
 			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/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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 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,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 削除処理実施

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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 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,
-                    DepartmentForm.convertFrom(
+                    DepartmentInfoForm.convertFrom(
                             searchDepartment.selectAll()
                     ));
 

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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 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,
-                    DepartmentForm.convertFrom(
+                    DepartmentInfoForm.convertFrom(
                             searchDepartment.selectAll()
                     ));
 

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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 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, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
             // パラメータをセット
             model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);

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

@@ -18,15 +18,11 @@ 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.DepartmentInfoForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartment;
 
-/**
- * 部署画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
- */
 @Controller
 public class SelectDepartmentController {
-
 	// ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
 	// エラーメッセージ用の定数フィールド
@@ -45,40 +41,41 @@ public class SelectDepartmentController {
 	}
 
 	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+	public SearchConditionDepartment searchConditionDepartment() {
-		return new SearchConditionDepartmentForm();
+		return new SearchConditionDepartment();
 	}
 
 	/**
 	 * 社員検索画面表示処理コントローラ
 	 *
-	 * @param searchConditionDepartmentForm 検索画面のフォーム
+	 * @param searchConditionDepartment 検索画面のフォーム
 	 * @param model                       ビューにデータを渡すためのコンテナ
 	 * @return 遷移先の画面
 	 */
 	@PermissionCheck
 	@SessionCheck
 	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+	public String select(SearchConditionDepartment searchConditionDepartment, Model model) {
+
 		try {
 
 			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
 			// 作成した部署一覧をセット
 			model.addAttribute(
 					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+					DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
 			// 検索条件を元に検索を実施
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
+			// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
-					searchDepartment
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(
-							.searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
+					searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment))));
-
 			// 検索ページに遷移
 			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
 
 		} catch (Exception e) {
 			// ログイン情報の破棄
 			httpSession.invalidate();
+
 			e.printStackTrace();
 
 			// エラーログ出力
@@ -86,7 +83,6 @@ public class SelectDepartmentController {
 			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
-
 	}
 
 	/**
@@ -105,10 +101,14 @@ public class SelectDepartmentController {
 		// 作成した部署一覧をセット
 		model.addAttribute(
 				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentForm.convertFrom(searchDepartment.selectAll()));
+				DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+
+		// 検索条件を元に検索を実施
+		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+				DepartmentInfoForm.convertFrom(
+						searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment()))));
 
 		// 検索ページに遷移
 		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
 	}
-
 }

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

@@ -1,14 +1,10 @@
 package com.example.rhizome.app.presentation.controller;
 
-import com.example.rhizome.aop.aspect.PermissionCheck;
+import java.util.logging.Level;
-import com.example.rhizome.aop.aspect.SessionCheck;
+import java.util.logging.Logger;
-import com.example.rhizome.app.domain.service.SearchDepartment;
+
-import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
+import javax.servlet.http.HttpSession;
-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.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;
@@ -16,9 +12,15 @@ 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 com.example.rhizome.aop.aspect.PermissionCheck;
-import java.util.logging.Level;
+import com.example.rhizome.aop.aspect.SessionCheck;
-import java.util.logging.Logger;
+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.EmployeeInfoForm;
+import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -65,11 +67,10 @@ public class SelectEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentInfoForm.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;
@@ -105,7 +106,7 @@ public class SelectEmployeeController {
         // 作成した部署一覧をセット
         model.addAttribute(
                 PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentForm.convertFrom(searchDepartment.selectAll())
+                DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
         );
 
         // 検索条件を元に検索を実施

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

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

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

@@ -1,129 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.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/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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 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, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
             // id を条件に更新対象のレコードを検索、取得する
             List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy(

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.DepartmentForm;
+import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
 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, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
 
             // パスワードが仕様を満たしているか確認
             String error = UpdateEmployeeInfoForm.validatePassword(

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

@@ -10,11 +10,10 @@ 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 = "updateDepartmentInfoForm";
+	public static final String UPDATE_DEPARTMENT_INFO_FORM = "updateDepartmentForm";
 
 }

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,19 +44,10 @@ 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 INSERT_DEPARTMENT_INPUT = "/";
+	public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
-	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";
 
 	/**
@@ -72,7 +63,6 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
-				DELETE_EMPLOYEE,
 				INSERT_EMPLOYEE_INPUT,
 				INSERT_EMPLOYEE_CONFIRM,
 				INSERT_EMPLOYEE,
@@ -84,7 +74,7 @@ public class TransitionTargetPageNameKeyword {
 				SELECT_DEPARTMENT_INFO,
 				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
 				DELETE_DEPARTMENT,
-				SHOW_UPDATE_DAPERTMENT,
+				SHOW_UPDATE_DEPARTMENT,
 				UPDATE_DEPARTMENT_RESULT);
 	}
 

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

@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class DepartmentForm {
+public class DepartmentInfoForm {
     /**
      * 部署ID
      */
@@ -30,8 +30,8 @@ public class DepartmentForm {
      * @param department business 層の Department インスタンス
      * @return 画面用（presentation 層）の DepartmentForm インスタンス
      */
-    public static DepartmentForm convertFrom(Department department) {
+    public static DepartmentInfoForm convertFrom(Department department) {
-        return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
+        return new DepartmentInfoForm(department.getIdDepartment(), department.getNmDepartment());
     }
 
     /**
@@ -41,7 +41,7 @@ public class DepartmentForm {
      * @param departmentList business 層の Department インスタンスのリスト
      * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト
      */
-    public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
+    public static List<DepartmentInfoForm> convertFrom(List<Department> departmentList) {
-        return departmentList.stream().map(DepartmentForm::convertFrom).toList();
+        return departmentList.stream().map(DepartmentInfoForm::convertFrom).toList();
     }
 }

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

@@ -0,0 +1,50 @@
+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());
+	}
+}

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

@@ -1,51 +0,0 @@
-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());
-	}
-}

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

@@ -0,0 +1,48 @@
+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;
+		}
+	}
+}

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

@@ -1,91 +0,0 @@
-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/templates/menu.html

@@ -14,36 +14,32 @@
 </head>
 
 <body>
-<h1>
+	<h1>
 		メインメニュー　　　
 		<div class="rightSection">
 			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
-</h1>
+	</h1>
-<table class="menuClass">
+	<table class="menuClass">
 		<tr>
 			<td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
 			</td>
 			<td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
-    </tr>
+			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i>部署検索</a>
-
-    <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><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
+			<td class="description">新規でユーザ追加を行います。</td>
+			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
+			</td>
 			<td class="description">新規で部署追加を行います。</td>
-    </tr>
 
-</table>
+
+	</table>
 </body>
 
 <script type="text/javascript">

src/main/resources/templates/selectDepartment.html

@@ -2,7 +2,6 @@
 <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>
@@ -12,91 +11,89 @@
 	<title>検索</title>
 
 </head>
+
 <body>
-<h1>
+	<h1>
 		検索条件入力　　　
 		<div class="rightSection">
 			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
-</h1>
+	</h1>
-<form action="selectDepartmentInfo"
+
-      method="post"
+	<form action="selectDepartmentInfo" method="post" th:object="${searchConditionDepartment}">
-      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"
+					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
-                       th:field="*{idDepartment}"
-                       type="number"/>
 				</td>
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
 				<td>
-                <input placeholder="部署名"
+					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
-                       th:field="*{nmDepartment}"
-                       type="text"/>
 				</td>
 			</tr>
-        
 			<tr>
 				<td class="btnArea" colspan="2">
-                <input type="submit" value="検索"/>
+					<input type="submit" value="検索" />
 				</td>
 				<td class="btnArea" colspan="2">
 					<button onclick="clearInput()">クリア</button>
 				</td>
 			</tr>
 		</table>
-</form>
+	</form>
-<div class="header-spacing"></div>
+
-<a href="showMenu">メニューに戻る</a>
+	<div class="header-spacing"></div>
-<div class="header-spacing"></div>
+	<a href="showMenu">メニューに戻る</a>
-<h1><span>検索結果</span></h1>
+	<div class="header-spacing"></div>
-<div class="header-spacing"></div>
+	<h1><span>検索結果</span></h1>
-<th:block th:if="${messageInfo != null}">
+	<div class="header-spacing"></div>
+	<th:block th:if="${messageInfo != null}">
 		<script th:inline="javascript">
 			alert([[${messageInfo.message}]]);
 		</script>
-</th:block>
+	</th:block>
-<div class="header-spacing"></div>
+	<div class="header-spacing"></div>
-<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+	<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>
+					<th style="width: 60px;">操作</th>
 				</tr>
-        </thead>
+</body>
-        <tbody>
+</thead>
-        <tr th:each="departmentInfoForm : ${departmentFormList}">
+<tbody>
-			
+	<tr th:each="departmentForm : ${departmentFormList}">
-            <td th:text="${departmentInfoForm.idDepartment}"></td>
+		<td th:text="${departmentForm.idDepartment}"></td>
-            <td th:text="${departmentInfoForm.nmDepartment}"></td>
+		<td th:text="${departmentForm.nmDepartment}"></td>
 		<td>
 			<!-- 更新フォーム -->
 			<form action="showUpdateDepartment" method="post" style="display: inline;">
-                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
+				<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
 				<input type="submit" value="更新">
 			</form>
 			<!-- 削除フォーム -->
 			<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
 				style="display: inline;">
-                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
+				<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
 				<input type="submit" value="削除">
 			</form>
+
 		</td>
 	</tr>
-        </tbody>
+</tbody>
-    </table>
+</table>
 </th:block>
 <th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
 	<!-- 検索結果が0件の場合 -->
@@ -109,9 +106,7 @@
 	function clearInput() {
 		document.getElementById('idDepartment').value = '';
 		document.getElementById('nmDepartment').value = '';
-        document.getElementById('idDepartment').selectedIndex = 0;
 	}
-
-
 </script>
+
 </html>

src/main/resources/templates/updateDepartmentForm.html

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

src/main/resources/templates/updateDepartmentInput.html

@@ -13,58 +13,41 @@
 </head>
 
 <body>
-<h1>
+	<h1>
 		部署情報更新　　　
 		<div class="rightSection">
 			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
-</h1>
+	</h1>
-<form action="/updateDepartmentResult"
+	<form action="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-      method="post"
+		th:object="${updateDepartmentForm}">
-      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>
+			<span class="error" th:text="${messageError.message}"></span>
 		</div>
 		<table>
 			<tr>
 				<th class="header">部署ID</th>
 				<td>
-                <label>
+					<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
-                    <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}"
-                    <input maxlength="50"
+						type="text" />
-                           placeholder="部署名"
-                           required="required"
-                           th:field="*{nmDepartment}"
-                           type="text"
-                    />
-                </label>
 				</td>
 			</tr>
 			<tr>
-            <td class="btnArea" colspan="2">
+				<td class="btnArea" colspan="2"><input type="submit" value="更新" /></td>
-                <input type="submit" value="更新"/>
-            </td>
 			</tr>
 		</table>
-</form>
+	</form>
-<a href="javascript:selectSubmit()">一覧に戻る</a>
+	<a href="javascript:selectSubmit()">一覧に戻る</a>
 </body>
-
+	<script>
-<script>
 		function selectSubmit() {
 				const form = document.createElement('form');
 				form.setAttribute('method', 'post');
@@ -83,6 +66,6 @@
 
 				form.submit();
 		}
+	</script>
 
-</script>
 </html>

src/main/resources/templates/updateEmployeeInput.html

@@ -13,18 +13,15 @@
 </head>
 
 <body>
-<h1>
+	<h1>
 		社員情報更新　　　
 		<div class="rightSection">
 			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
 			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
 		</div>
-</h1>
+	</h1>
-<form action="/updateEmployeeResult"
+	<form action="/updateEmployeeResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-      method="post"
+		th:object="${updateEmployeeInfoForm}">
-      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>
@@ -33,11 +30,7 @@
 				<th class="header">社員ID</th>
 				<td>
 					<label>
-                    <input class="readOnly"
+						<input class="readOnly" readonly="readonly" th:field="*{idEmployee}" type="text" />
-                           readonly="readonly"
-                           th:field="*{idEmployee}"
-                           type="text"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -45,12 +38,8 @@
 				<th class="header">社員名</th>
 				<td>
 					<label>
-                    <input maxlength="50"
+						<input maxlength="50" placeholder="社員名" required="required" th:field="*{nmEmployee}"
-                           placeholder="社員名"
+							type="text" />
-                           required="required"
-                           th:field="*{nmEmployee}"
-                           type="text"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -58,13 +47,8 @@
 				<th class="header">社員名フリガナ</th>
 				<td>
 					<label>
-                    <input maxlength="50"
+						<input maxlength="50" oninput="convertToKatakana(this)" placeholder="フリガナ" required="required"
-                           oninput="convertToKatakana(this)"
+							th:field="*{knEmployee}" type="text" />
-                           placeholder="フリガナ"
-                           required="required"
-                           th:field="*{knEmployee}"
-                           type="text"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -72,12 +56,8 @@
 				<th class="header">メールアドレス</th>
 				<td>
 					<label>
-                    <input maxlength="100"
+						<input maxlength="100" placeholder="メールアドレス" required="required" th:field="*{mailAddress}"
-                           placeholder="メールアドレス"
+							type="email" />
-                           required="required"
-                           th:field="*{mailAddress}"
-                           type="email"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -85,11 +65,8 @@
 				<th class="header">パスワード</th>
 				<td>
 					<label>
-                    <input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$"
+						<input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$" placeholder="パスワード"
-                           placeholder="パスワード"
+							th:field="*{password}" type="password" />
-                           th:field="*{password}"
-                           type="password"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -108,11 +85,8 @@
 				<th class="header">パスワード確認用</th>
 				<td>
 					<label>
-                    <input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$"
+						<input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$" placeholder="パスワード確認用"
-                           placeholder="パスワード確認用"
+							th:field="*{passwordConfirm}" type="password" />
-                           th:field="*{passwordConfirm}"
-                           type="password"
-                    />
 					</label>
 				</td>
 			</tr>
@@ -121,14 +95,12 @@
 				<td>
 					<label>
 						<input id="adminAuth1" name="adminAuth" th:checked="${updateEmployeeInfoForm.adminAuth == 1}"
-                           type="radio"
+							type="radio" value="1"> 管理者権限
-                           value="1"> 管理者権限
 					</label>
 					<label>
 						<input id="adminAuth0" name="adminAuth"
 							th:checked="${updateEmployeeInfoForm.adminAuth == null or updateEmployeeInfoForm.adminAuth == 0}"
-                           type="radio"
+							type="radio" value="0">
-                           value="0">
 						一般権限
 					</label>
 				</td>
@@ -140,8 +112,7 @@
 						<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:text="${department.nmDepartment}" th:value="${department.idDepartment}">
-                                th:value="${department.idDepartment}">
 							</option>
 						</select>
 					</label>
@@ -149,12 +120,12 @@
 			</tr>
 			<tr>
 				<td class="btnArea" colspan="2">
-                <input type="submit" value="更新"/>
+					<input type="submit" value="更新" />
 				</td>
 			</tr>
 		</table>
-</form>
+	</form>
-<a href="javascript:selectSubmit()">一覧に戻る</a>
+	<a href="javascript:selectSubmit()">一覧に戻る</a>
 </body>
 
 <script>
@@ -178,4 +149,5 @@
 	}
 
 </script>
+
 </html>