Done Stept 4 em spring

.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,2 @@
+/target/
+/bin/

.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.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</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=disabled
+org.eclipse.jdt.core.compiler.source=17

.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

pom.xml

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

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

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

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

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

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

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

@@ -12,6 +12,5 @@ public interface SearchDepartment {
 
 	List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
 
-	Department searchDepartmentByIdDepartment(Integer idDepartment);
+	Department searchById(Integer idDepartment);
-
 }

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

@@ -3,6 +3,5 @@ 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 update(Department department);
-
 }

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

@@ -2,32 +2,19 @@ package com.example.rhizome.app.domain.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.example.rhizome.app.domain.service.DeleteDepartment;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
-/**
- * Department レコード削除関連の機能を持つサービス
- */
 @Service
-@Transactional
 public class DeleteDepartmentImpl implements DeleteDepartment {
 
-	DepartmentRepository departmentRepository;
+    @Autowired
-
+    private DepartmentRepository departmentRepository;
-	@Autowired
-	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	/**
-	 * idDepartment を元に department データを削除
-	 *
-	 * @param idDepartment 削除対象のidDepartment
-	 */
-	public void deleteDepartment(Integer idDepartment) {
-		departmentRepository.deleteById(idDepartment);
-	}
 
+    @Override
+    public void delete(Integer idDepartment) {
+        // JpaRepository တွင်ပါရှိသော deleteById ကို အသုံးပြု၍ ဖယ်ရှားရန်
+        departmentRepository.deleteById(idDepartment);
+    }
 }

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

@@ -0,0 +1,29 @@
+package com.example.rhizome.app.domain.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.service.InsertDepartment;
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
+
+@Service
+@Transactional
+public class InsertDepartmentImpl implements InsertDepartment {
+
+	DepartmentRepository departmentRepository;
+
+	@Autowired
+	public InsertDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+
+	@Override
+	public void insert(Department department) {
+		DepartmentEntity entity = new DepartmentEntity();
+		entity.setNmDepartment(department.getNmDepartment());
+		departmentRepository.save(entity);
+	}
+}

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

@@ -1,5 +1,6 @@
 package com.example.rhizome.app.domain.service.impl;
 
+
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,69 +21,80 @@ import com.example.rhizome.app.infra.repository.DepartmentRepository;
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
 
-	DepartmentRepository departmentRepository;
+    DepartmentRepository departmentRepository;
 
-	/**
+    /**
-	 * コンストラクタ
+     * コンストラクタ
-	 *
+     *
-	 * @param departmentRepository DI対象
+     * @param departmentRepository DI対象
-	 */
+     */
-	@Autowired
+    @Autowired
-	public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
+    public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
+        this.departmentRepository = departmentRepository;
-	}
+    }
 
-	/**
+    /**
-	 * 部署情報を全件取得する
+     * 部署情報を全件取得する
-	 *
+     *
-	 * @return 取得した部署情報レコード全件
+     * @return 取得した部署情報レコード全件
-	 */
+     */
-	public List<Department> selectAll() {
+    public List<Department> selectAll() {
-		return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
+        return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
-	}
+    }
 
-	/**
+    /**
-	 * searchConditionDepartment の情報を元に Department のレコードを取得
+     * searchConditionDepartment の情報を元に Department のレコードを取得
-	 *
+     *
-	 * @param searchConditionDepartment 検索条件
+     * @param searchConditionDepartment 検索条件
-	 * @return 検索結果のレコード
+     * @return 検索結果のレコード
-	 */
+     */
-	public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
+    public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
-		// 動的に検索条件を絞り込む
+        // 動的に検索条件を絞り込む
-		// Specification は Criteria API の Predicate をラップしたもの
+        // Specification は Criteria API の Predicate をラップしたもの
-		return DepartmentEntity
+        return DepartmentEntity
-				.createDepartmentList(
+                .createDepartmentList(
-						departmentRepository.findAll(Specification
+                        departmentRepository.findAll(Specification
-								.where(DepartmentRepository
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
-								.and(DepartmentRepository
+                        )
-										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
+                );
 
-	}
+    }
 
-	/**
+    /**
-	 * searchConditionDepartment の情報を元に Department のレコードを取得
+     * searchConditionDepartment の情報を元に Department のレコードを取得
-	 * 部分一致検索
+     * 部分一致検索
-	 *
+     *
-	 * @param searchConditionDepartment 検索条件
+     * @param searchConditionDepartment 検索条件
-	 * @return 検索結果のレコード
+     * @return 検索結果のレコード
-	 */
+     */
-	public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
+    public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
-		// 動的に検索条件を絞り込む
+        // 動的に検索条件を絞り込む
-		// Specification は Criteria API の Predicate をラップしたもの
+        // Specification は Criteria API の Predicate をラップしたもの
-		return DepartmentEntity
+        return DepartmentEntity
-				.createDepartmentList(
+                .createDepartmentList(
-						departmentRepository.findAll(Specification
+                        departmentRepository.findAll(Specification
-								.where(DepartmentRepository
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
-								.and(DepartmentRepository
+                        )
-										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
+                );
+
+    }
+
+	@Override
+	public Department searchById(Integer idDepartment) {
+		// TODO 自動生成されたメソッド・スタブ
+		if (idDepartment == null) {
+            return null;
+        }
+        
+        return departmentRepository.findById(idDepartment)
+                .map(entity -> {
+                    List<Department> list = DepartmentEntity.createDepartmentList(List.of(entity));
+                    return list.isEmpty() ? null : list.get(0);
+                })
+                .orElse(null);
     
-	}
 		
-	//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

@@ -2,52 +2,25 @@ package com.example.rhizome.app.domain.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.service.UpdateDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
-/**
- * department の更新系の機能を集約させるサービスクラスです。
- */
 @Service
-@Transactional
 public class UpdateDepartmentImpl implements UpdateDepartment {
 
-	DepartmentRepository departmentRepository;
+    @Autowired
+    private DepartmentRepository departmentRepository;
 
-	@Autowired
+    @Override
-	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
+    public void update(Department department) {
-		this.departmentRepository = departmentRepository;
+        // Model မှ Entity သို့ ပြောင်းလဲခြင်း သို့မဟုတ် သက်ဆိုင်ရာ update ကို save ဖြင့် လုပ်ဆောင်ရန်
-	}
+        DepartmentEntity entity = new DepartmentEntity();
-
+        entity.setIdDepartment(department.getIdDepartment());
-	/**
+        entity.setNmDepartment(department.getNmDepartment());
-	 * 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());
-
-	}
         
+        departmentRepository.save(entity);
+    }
 }

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

src/main/java/com/example/rhizome/app/infra/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,35 +20,31 @@ 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 :
-		// 戻り値の型 Specification<DepartmentEntity> にキャスト
-				(Specification<DepartmentEntity>)
-				// ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
-				// を作成している
-				(root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
-	}
 
-	static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
+    static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
+        return idDepartment == null ?
-				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+                null :
-						.like(root.get("nmDepartment"), nmDepartment);
+                // 戻り値の型 Specification<DepartmentEntity> にキャスト
-	}
+                (Specification<DepartmentEntity>)
+                        // ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
+                        // を作成している
+                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
+    }
 
-	static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
+    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 void deleteBy(Integer id) {
-
-	}
-
-	//idで検索
-	Optional<DepartmentEntity> findByIdDepartment(Integer idDepartment);
 
+    static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
+        return (nmDepartment == null || nmDepartment.isEmpty()) ?
+                null :
+                (Specification<DepartmentEntity>)
+                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
+    }
 }

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

@@ -1,125 +1,47 @@
 package com.example.rhizome.app.presentation.controller;
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import javax.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.DeleteDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployee;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 
-/**
- * 削除処理のコントローラ
- */
 @Controller
 public class DeleteDepartmentController {
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
 
-	// エラーメッセージ用の定数フィールド
+    HttpSession httpSession;
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+    DeleteDepartment deleteDepartment;
 
-	HttpSession httpSession;
+    @Autowired
-	DeleteDepartment deleteDepartment;
+    public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment) {
-	SearchDepartment searchDepartment;
+        this.httpSession = httpSession;
-	SearchEmployee searchEmployee;
+        this.deleteDepartment = deleteDepartment;
+    }
 
-	@Autowired
+    @SessionCheck
-	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
+    @PostMapping("/deleteDepartmentInput")
-			HttpSession httpSession, SearchEmployee searchEmployee) {
+    public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-		this.httpSession = httpSession;
+        final String DELETE_COMPLETE = "削除しました。";
-		this.deleteDepartment = deleteDepartment;
-		this.searchDepartment = searchDepartment;
-		this.searchEmployee = searchEmployee;
-	}
 
-	/**
+        try {
-	 * 削除処理のコントローラ
+            // ဌာန ဖယ်ရှားခြင်း လုပ်ဆောင်ချက်
-	 *
+            deleteDepartment.delete(idDepartment);
-	 * @param idDepartment 削除対象のdepartmentId
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
-	public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-		try {
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-			// 削除処理実施
+            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
-			deleteExec(
+            return "forward:/selectDepartment";
-					model,
-					idDepartment,
-					LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
 
-			// 検索画面に遷移
+        } catch (Exception e) {
-			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
+            httpSession.invalidate();
-
+            e.printStackTrace();
-		} catch (Exception e) {
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
-			// ログイン情報の破棄
+        }
-			httpSession.invalidate();
+    }
-
-			e.printStackTrace();
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-
-	/**
-	 * 削除処理実施
-	 *
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @param idDepartment 削除対象のdepartmentId
-	 * @param loginUser  ログインユーザー情報
-	 */
-	private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
-
-		final String DELETE_COMPLETE = "削除しました。";
-		final String ID_TO_DELETED_IS_UNKNOWN = "削除対象のIDが不明です。";
-		final String YOU_CANNOT_DELETE_A_DEPARTMENT_THAT_HAS_ONE_OR_MORE_MEMBERS_ASSIGNED_TO_IT = "1名以上が所属している部署は削除出来ません。";
-
-		if (searchDepartment.searchDepartmentByIdDepartment(idDepartment) == null) {
-			// エラーメッセージをセット
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(ID_TO_DELETED_IS_UNKNOWN));
-			return;
-		}
-
-		if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-					new MessageForm(YOU_CANNOT_DELETE_A_DEPARTMENT_THAT_HAS_ONE_OR_MORE_MEMBERS_ASSIGNED_TO_IT));
-			return;
-		}
-		// 削除を実施
-		deleteDepartment.deleteDepartment(idDepartment);
-
-		// 削除完了したメッセージをセット
-		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
-
-	}
 }

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

@@ -0,0 +1,78 @@
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.service.InsertDepartment;
+import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.MessageForm;
+
+@Controller
+public class InsertDepartmentController {
+
+    private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    HttpSession httpSession;
+    InsertDepartment insertDepartment;
+
+    @Autowired
+    public InsertDepartmentController(HttpSession httpSession, InsertDepartment insertDepartment) {
+        this.httpSession = httpSession;
+        this.insertDepartment = insertDepartment;
+    }
+
+    /**
+     * 部署登録入力画面を表示する
+     */
+    @SessionCheck
+    @RequestMapping(value = "/insertDepartmentInput", method = {RequestMethod.GET, RequestMethod.POST})
+    public String showInsertDepartment(Model model) {
+        try {
+            model.addAttribute("departmentForm", new DepartmentForm());
+            return "insertDepartmentInput";
+        } catch (Exception e) {
+            httpSession.invalidate();
+            e.printStackTrace();
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
+        }
+    }
+
+    /**
+     * 部署情報の登録を実行する
+     */
+    @SessionCheck
+    @PostMapping("/insertDepartmentResult")
+    public String insertDepartmentResult(@ModelAttribute("departmentForm") DepartmentForm departmentForm, Model model) {
+        final String INSERT_COMPLETE = "登録しました。";
+
+        try {
+            Department department = new Department(null, departmentForm.getNmDepartment());
+            insertDepartment.insert(department);
+
+            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(INSERT_COMPLETE));
+            return "forward:/selectDepartment";
+
+        } catch (Exception e) {
+            httpSession.invalidate();
+            e.printStackTrace();
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
+        }
+    }
+}

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

@@ -1,114 +1,41 @@
 package com.example.rhizome.app.presentation.controller;
 
-import java.util.logging.Level;
+import java.util.List;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
 
-/**
- * 部署画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
- */
 @Controller
 public class SelectDepartmentController {
 
-	// ログ出力用インスタンス
+    @Autowired
-	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
+    private SearchDepartment searchDepartment;
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	HttpSession httpSession;
+    /** 部署検索画面の初期表示 */
-	SearchDepartment searchDepartment;
+    @SessionCheck
-	SearchEmployeeInfo searchEmployeeInfo;
+    @GetMapping("/showSelectDepartment")
+    public String showSelectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm) {
+        return "selectDepartment";
+    }
 
-	@Autowired
+    /** 部署検索処理 */
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+    @PostMapping("/selectDepartment")
-			SearchEmployeeInfo searchEmployeeInfo) {
+    public String selectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-		this.httpSession = httpSession;
+        List<Department> departmentList = searchDepartment.searchByWithLike(
-		this.searchDepartment = searchDepartment;
+                SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm)
-		this.searchEmployeeInfo = searchEmployeeInfo;
+        );
-	}
-
-	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartmentForm();
-	}
-
-	/**
-	 * 社員検索画面表示処理コントローラ
-	 *
-	 * @param searchConditionDepartmentForm 検索画面のフォーム
-	 * @param model                       ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-		try {
-
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-			// 検索条件を元に検索を実施
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
-					searchDepartment
-							.searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
-
-			// 検索ページに遷移
-			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-			e.printStackTrace();
-
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-
-	}
-
-	/**
-	 * 部署検索画面表示処理コントローラ
-	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
-	 *
-	 * @param model ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
-	public String select(Model model) {
-
-		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-		// 作成した部署一覧をセット
-		model.addAttribute(
-				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-		// 検索ページに遷移
-		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-	}
 
+        model.addAttribute("departmentFormList", DepartmentForm.convertFrom(departmentList));
+        return "selectDepartment";
+    }
 }

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

@@ -9,77 +9,81 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.example.rhizome.aop.aspect.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.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.SearchConditionEmployeeForm;
+import com.example.rhizome.app.presentation.form.MessageForm;
 
-/**
- * 更新対象の Department が存在するか確認する為のコントローラ
- */
 @Controller
 public class UpdateDepartmentController {
 
-	// ログ出力用インスタンス
+    private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
-	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-	HttpSession httpSession;
+    HttpSession httpSession;
-	SearchDepartment searchDepartment;
+    SearchDepartment searchDepartment;
-	SearchEmployeeInfo searchEmployeeInfo;
+    UpdateDepartment updateDepartment; // 追加
 
-	@Autowired
+    @Autowired
-	public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+    public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment, UpdateDepartment updateDepartment) {
-			SearchEmployeeInfo searchEmployeeInfo) {
+        this.httpSession = httpSession;
-		this.httpSession = httpSession;
+        this.searchDepartment = searchDepartment;
-		this.searchDepartment = searchDepartment;
+        this.updateDepartment = updateDepartment; // 追加
-		this.searchEmployeeInfo = searchEmployeeInfo;
+    }
-	}
 
-	@ModelAttribute
+    @SessionCheck
-	public SearchConditionEmployeeForm searchConditionEmployeeForm() {
+    @PostMapping("/updateDepartmentInput")
-		return new SearchConditionEmployeeForm();
+    public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-	}
+        final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
 
-	/**
+        try {
-	 * 更新対象の department が存在するか確認する為のコントローラ
+            Department department = searchDepartment.searchById(idDepartment);
-	 *
-	 * @param idDepartment 更新対象の employee の id
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DAPERTMENT, method = RequestMethod.POST)
-	public String showUpdateDepatment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
-		try {
-			// 部署一覧を取得し画面に返す値としてセット
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.searchDepartmentByIdDepartment(idDepartment)));
 
-			// Update画面に遷移
+            if (department == null) {
-			return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
-		} catch (Exception e) {
+                return "forward:/selectDepartment";
-			// ログイン情報の破棄
+            }
-			httpSession.invalidate();
 
-			e.printStackTrace();
+            model.addAttribute("departmentForm", DepartmentForm.convertFrom(department));
+            return "updateDepartmentInput";
 
-			// エラーログ出力
+        } catch (Exception e) {
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            httpSession.invalidate();
-			// エラー画面遷移
+            e.printStackTrace();
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
+        }
+    }
 
-		}
+    /**
-	}
+     * 部署情報の更新を実行する
+     */
+    @SessionCheck
+    @RequestMapping(value = "/updateDepartmentResult", method = RequestMethod.POST)
+    public String updateDepartmentResult(@ModelAttribute("departmentForm") DepartmentForm departmentForm, Model model) {
+        final String UPDATE_COMPLETE = "更新しました。";
+
+        try {
+            Department department = new Department(departmentForm.getIdDepartment(), departmentForm.getNmDepartment());
+            updateDepartment.update(department);
+
+            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
+            return "forward:/selectDepartment";
+
+        } catch (Exception e) {
+            httpSession.invalidate();
+            e.printStackTrace();
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
+        }
+    }
 }

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

@@ -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/pageproperty/PageReturnAttributeKeyword.java

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

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

@@ -7,100 +7,87 @@ import java.util.Set;
  */
 public class TransitionTargetPageNameKeyword {
 
-	// 共通
+    // 共通
-	public static final String LOGIN_HTML = "login";
+    public static final String LOGIN_HTML = "login";
 
-	// 一般向け
+    // 一般向け
-	public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
+    public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
-	public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
+    public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
 
-	// 管理者向け
+    // 管理者向け
-	public static final String MENU_HTML = "menu";
+    public static final String MENU_HTML = "menu";
-	public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
+    public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
-	public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
+    public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
-	public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
+    public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
-	public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
+    public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
-	public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
+    public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
 
-	public static final String ERROR_HTML = "error";
+    public static final String ERROR_HTML = "error";
 
-	// 共通(Controller)
+    // 共通(Controller)
-	public static final String INDEX_BLANK = "";
+    public static final String INDEX_BLANK = "";
-	public static final String INDEX_SLASH = "/";
+    public static final String INDEX_SLASH = "/";
-	public static final String INDEX_LOGIN = "/login";
+    public static final String INDEX_LOGIN = "/login";
-	public static final String LOGOUT = "/logout";
+    public static final String LOGOUT = "/logout";
-	public static final String DO_LOGIN = "/doLogin";
+    public static final String DO_LOGIN = "/doLogin";
 
-	// 一般向け(Controller)
+    // 一般向け(Controller)
-	public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
+    public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
 
-	// 管理者向け(Controller)
+    // 管理者向け(Controller)
-	public static final String DELETE_EMPLOYEE = "/deleteEmployee";
+    public static final String DELETE_EMPLOYEE = "/deleteEmployee";
-	public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
+    public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
-	public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
+    public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
-	public static final String INSERT_EMPLOYEE = "/insertEmployee";
+    public static final String INSERT_EMPLOYEE = "/insertEmployee";
-	public static final String SHOW_MENU = "/showMenu";
+    public static final String SHOW_MENU = "/showMenu";
-	public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
+    public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
-	public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
+    public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
-	public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
+    public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
-	public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
+    public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
-	// Department
+    // Department
-	// HTML
+    // HTML
-	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+    // Controller
-	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
-	// Controller
-	public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
-	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/departmentAll";
-	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-	public static final String INSERT_DEPARTMENT_INPUT = "/";
-	public static final String INSERT_DEPARTMENT_CONFIRM = "/";
-	public static final String INSERT_DEPARTMENT = "/";
-	public static final String SHOW_UPDATE_DAPERTMENT = "/showUpdateDepartment";
-	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
 
-	/**
+    /**
-	 * 管理者向けのページリストを返す
+     * 管理者向けのページリストを返す
-	 *
+     *
-	 * @return 管理者向けのページリスト
+     * @return 管理者向けのページリスト
-	 */
+     */
-	public static Set<String> getAdminPageList() {
+    public static Set<String> getAdminPageList() {
 
-		return Set.of(
+        return Set.of(
-				INDEX_BLANK,
+                INDEX_BLANK,
-				INDEX_SLASH,
+                INDEX_SLASH,
-				INDEX_LOGIN,
+                INDEX_LOGIN,
-				LOGOUT,
+                LOGOUT,
-				DO_LOGIN,
+                DO_LOGIN,
-				DELETE_EMPLOYEE,
+                DELETE_EMPLOYEE,
-				INSERT_EMPLOYEE_INPUT,
+                INSERT_EMPLOYEE_INPUT,
-				INSERT_EMPLOYEE_CONFIRM,
+                INSERT_EMPLOYEE_CONFIRM,
-				INSERT_EMPLOYEE,
+                INSERT_EMPLOYEE,
-				SHOW_MENU,
+                SHOW_MENU,
-				SELECT_EMPLOYEE_INFO,
+                SELECT_EMPLOYEE_INFO,
-				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
+                SELECT_EMPLOYEE_INFO_FORM_EMPTY,
-				SHOW_UPDATE_EMPLOYEE,
+                SHOW_UPDATE_EMPLOYEE,
-				UPDATE_EMPLOYEE_RESULT,
+                UPDATE_EMPLOYEE_RESULT
-				SELECT_DEPARTMENT_INFO,
+        );
-				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
+    }
-				DELETE_DEPARTMENT,
-				SHOW_UPDATE_DAPERTMENT,
-				UPDATE_DEPARTMENT_RESULT);
-	}
 
-	/**
+    /**
-	 * 一般向けのページリストを返す
+     * 一般向けのページリストを返す
-	 *
+     *
-	 * @return 一般向けのページリスト
+     * @return 一般向けのページリスト
-	 */
+     */
-	public static Set<String> getUserPageList() {
+    public static Set<String> getUserPageList() {
-		return Set.of(
+        return Set.of(
-				INDEX_BLANK,
+                INDEX_BLANK,
-				INDEX_SLASH,
+                INDEX_SLASH,
-				INDEX_LOGIN,
+                INDEX_LOGIN,
-				LOGOUT,
+                LOGOUT,
-				DO_LOGIN,
+                DO_LOGIN,
-				PERSONAL_UPDATE_RESULT);
+                PERSONAL_UPDATE_RESULT
-	}
+        );
+    }
 
 }

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

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

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/insertDepartmentInput.html

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

src/main/resources/templates/menu.html

@@ -3,125 +3,125 @@
 
 <head>
 
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-    <!-- 外部のスクリプトファイルを読み込む -->
+	<!-- 外部のスクリプトファイルを読み込む -->
-    <script th:src="@{/js/common.js}"></script>
+	<script th:src="@{/js/common.js}"></script>
-    <!-- CSSの読み込み -->
+	<!-- CSSの読み込み -->
-    <link rel="stylesheet" th:href="@{/css/all.css}">
+	<link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>メニュー</title>
+	<title>メニュー</title>
 
 </head>
 
 <body>
-<h1>
+	<h1>
-    メインメニュー　　　
+		メインメニュー　　　
-    <div class="rightSection">
+		<div class="rightSection">
-        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
+		</div>
-</h1>
+	</h1>
-<table class="menuClass">
+	<table class="menuClass">
-    <tr>
+		<tr>
-        <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
+			<td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
-        </td>
+			</td>
-        <td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
+			<td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
-    </tr>
+			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
-
+			</td>
-    <tr>
+			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。
-        <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
+			</td>
-        <td class="description">新規でユーザ追加を行います。</td>
+		</tr>
-    </tr>
+		<!-- ဒီနေရာမှာ ဌာနရှာဖွေခြင်း (部署検索) ကို ထည့်ပါ -->
-    <tr>
+		<tr>
-        <td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
+			<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a>
-        </td>
+			</td>
-        <td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
+			<td class="description">新規でユーザ追加を行います。
-    </tr>
+			</td>
-
+			<!-- ဒီနေရာမှာ ဌာနအသစ်ထည့်သွင်းခြင်း (部署登録) ကို ထည့်ပါ -->
-    <tr>
+			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
-        <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+			</td>
-        <td class="description">新規で部署追加を行います。</td>
+			<td class="description">新規で部署追加を行います。
-    </tr>
+			</td>
-
+		</tr>
-</table>
+	</table>
 </body>
 
 <script type="text/javascript">
-    function selectEmployeeSubmit() {
+	function selectEmployeeSubmit() {
-        const form = document.createElement('form');
+		const form = document.createElement('form');
-        form.setAttribute('method', 'post');
+		form.setAttribute('method', 'post');
-        form.setAttribute('action', 'selectEmployeeInfo');
+		form.setAttribute('action', 'selectEmployeeInfo');
 
-        // 動的送信用のHidden
+		// 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-        const inputField = document.createElement("input");
+		const inputField = document.createElement("input");
-        inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("value", "selectEmployeeInfo");
+		inputField.setAttribute("value", "selectEmployeeInfo");
 
-        form.appendChild(inputField);
+		form.appendChild(inputField);
 
-        // フォームをDOMに追加
+		// フォームをDOMに追加
-        document.body.appendChild(form);
+		document.body.appendChild(form);
 
-        form.submit();
+		form.submit();
-    }
+	}
 
-    function selectDepartmentSubmit() {
+	function selectDepartmentSubmit() {
-        const form = document.createElement('form');
+		const form = document.createElement('form');
-        form.setAttribute('method', 'post');
+		form.setAttribute('method', 'post');
-        form.setAttribute('action', 'selectDepartmentInfo');
+		form.setAttribute('action', 'selectDepartment');
 
-        // 動的送信用のHidden
+		// 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-        const inputField = document.createElement("input");
+		const inputField = document.createElement("input");
-        inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("value", "selectDepartment");
+		inputField.setAttribute("value", "selectDepartment");
 
-        form.appendChild(inputField);
+		form.appendChild(inputField);
 
-        // フォームをDOMに追加
+		// フォームをDOMに追加
-        document.body.appendChild(form);
+		document.body.appendChild(form);
 
-        form.submit();
+		form.submit();
-    }
+	}
 
-    function insertEmployeeSubmit() {
+	function insertEmployeeSubmit() {
-        const form = document.createElement('form');
+		const form = document.createElement('form');
-        form.setAttribute('method', 'post');
+		form.setAttribute('method', 'post');
-        form.setAttribute('action', 'insertEmployeeInput');
+		form.setAttribute('action', 'insertEmployeeInput');
 
-        // 動的送信用のHidden
+		// 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-        const inputField = document.createElement("input");
+		const inputField = document.createElement("input");
-        inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("value", "insertEmployeeInput");
+		inputField.setAttribute("value", "insertEmployeeInput");
 
-        form.appendChild(inputField);
+		form.appendChild(inputField);
 
-        // フォームをDOMに追加
+		// フォームをDOMに追加
-        document.body.appendChild(form);
+		document.body.appendChild(form);
 
-        form.submit();
+		form.submit();
-    }
+	}
 
-    function insertDepartmentSubmit() {
+	function insertDepartmentSubmit() {
-        const form = document.createElement('form');
+		const form = document.createElement('form');
-        form.setAttribute('method', 'post');
+		form.setAttribute('method', 'post');
-        form.setAttribute('action', 'insertDepartmentInput');
+		form.setAttribute('action', 'insertDepartmentInput');
 
-        // 動的送信用のHidden
+		// 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-        const inputField = document.createElement("input");
+		const inputField = document.createElement("input");
-        inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("value", "insertDepartmentInput");
+		inputField.setAttribute("value", "insertDepartmentInput");
 
-        form.appendChild(inputField);
+		form.appendChild(inputField);
 
-        // フォームをDOMに追加
+		// フォームをDOMに追加
-        document.body.appendChild(form);
+		document.body.appendChild(form);
 
-        form.submit();
+		form.submit();
-    }
+	}
 </script>
 
 </html>

src/main/resources/templates/selectDepartment.html

@@ -2,116 +2,118 @@
 <html xmlns:th="http://www.thymeleaf.org">
 
 <head>
-
+	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+	<script th:src="@{/js/common.js}"></script>
-    <!-- 外部のスクリプトファイルを読み込む -->
+	<link rel="stylesheet" th:href="@{/css/all.css}">
-    <script th:src="@{/js/common.js}"></script>
+	<link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">
-    <!-- CSSの読み込み -->
+	<title>部署検索</title>
-    <link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>検索</title>
-
 </head>
+
 <body>
-<h1>
+	<h1>部署検索条件入力
-    検索条件入力　　　
+		<div class="rightSection">
-    <div class="rightSection">
+			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+		</div>
-    </div>
+	</h1>
-</h1>
-<form action="selectDepartmentInfo"
-      method="post"
-      th:object="${searchConditionDepartmentForm}">
 
-    <div class="msgBox error" th:if="${messageError} != null">
+	<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
-        <span class="error" th:text="${messageError.message}"></span>
+		<table>
-    </div>
+			<tr>
-    <table>
+				<th class="header">部署ID</th>
-        <tr>
+				<td>
-            <th class="header">部署ID</th>
+					<input id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number" />
-            <td>
+				</td>
-                <input placeholder="部署ID"
+			</tr>
-                       th:field="*{idDepartment}"
+			<tr>
-                       type="number"/>
+				<th class="header">部署名</th>
-            </td>
+				<td>
-        </tr>
+					<input id="nmDepartment" placeholder="部署名" th:field="*{nmDepartment}" type="text" />
-        <tr>
+				</td>
-            <th class="header">部署名</th>
+			</tr>
-            <td>
+			<tr>
-                <input placeholder="部署名"
+				<td class="btnArea" colspan="2">
-                       th:field="*{nmDepartment}"
+					<input type="submit" value="検索" />
-                       type="text"/>
+				</td>
-            </td>
+				<td class="btnArea" colspan="2">
-        </tr>
+					<button type="button" onclick="clearInput()">クリア</button>
+				</td>
+			</tr>
+		</table>
+	</form>
 
-        <tr>
+	<div class="header-spacing"></div>
-            <td class="btnArea" colspan="2">
+	<a href="showMenu">メニューに戻る</a>
-                <input type="submit" value="検索"/>
+	<div class="header-spacing"></div>
-            </td>
+	<h1><span>検索結果</span></h1>
-            <td class="btnArea" colspan="2">
+	<div class="header-spacing"></div>
-                <button onclick="clearInput()">クリア</button>
-            </td>
-        </tr>
-    </table>
-</form>
-<div class="header-spacing"></div>
-<a href="showMenu">メニューに戻る</a>
-<div class="header-spacing"></div>
-<h1><span>検索結果</span></h1>
-<div class="header-spacing"></div>
-<th:block th:if="${messageInfo != null}">
-    <script th:inline="javascript">
-        alert([[${messageInfo.message}]]);
-    </script>
-</th:block>
-<div class="header-spacing"></div>
-<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
-    <!-- 検索結果が1件以上ある場合 -->
-    <table class="table-grid table-striped table-hover">
-        <thead>
-        <tr>
-            <th style="width: 60px;">部署ID</th>
-            <th style="width: 100px;">部署名</th>
-            <th style="width: 150px;">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr th:each="departmentInfoForm : ${departmentFormList}">
 
-            <td th:text="${departmentInfoForm.idDepartment}"></td>
+	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
-            <td th:text="${departmentInfoForm.nmDepartment}"></td>
+		<table class="table-grid table-striped table-hover">
-            <td>
+			<thead>
-                <!-- 更新フォーム -->
+				<tr>
-                <form action="showUpdateDepartment" method="post" style="display: inline;">
+					<th style="width: 100px;">部署ID</th>
-                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
+					<th style="width: 200px;">部署名</th>
-                    <input type="submit" value="更新">
+					<th style="width: 200px;">操作</th>
-                </form>
+				</tr>
-                <!-- 削除フォーム -->
+			</thead>
-                <form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
+			<tbody>
-                      style="display: inline;">
+				<tr th:each="departmentForm : ${departmentFormList}">
-                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
+					<td th:text="${departmentForm.idDepartment}"></td>
-                    <input type="submit" value="削除">
+					<td th:text="${departmentForm.nmDepartment}"></td>
-                </form>
+					<td>
-            </td>
+						<button type="button"
-        </tr>
+							th:onclick="'updateDepartment(' + ${departmentForm.idDepartment} + ')'">更新</button>
-        </tbody>
+						<button type="button"
-    </table>
+							th:onclick="'deleteDepartment(' + ${departmentForm.idDepartment} + ')'">削除</button>
-</th:block>
+					</td>
-<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+				</tr>
-    <!-- 検索結果が0件の場合 -->
+			</tbody>
-    検索結果はありません。
+		</table>
-</th:block>
+	</th:block>
 
+	<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+		検索結果はありません。
+	</th:block>
+
+	<script type="text/javascript">
+		function clearInput() {
+			document.getElementById('idDepartment').value = '';
+			document.getElementById('nmDepartment').value = '';
+		}
+		// 部署更新用のJavaScript
+		function updateDepartment(idDepartment) {
+			const form = document.createElement('form');
+			form.setAttribute('method', 'post');
+			form.setAttribute('action', 'updateDepartmentInput'); // Update Controller ၏ URL သို့မဟုတ် Path
+
+			const inputField = document.createElement("input");
+			inputField.setAttribute("type", "hidden");
+			inputField.setAttribute("name", "idDepartment");
+			inputField.setAttribute("value", idDepartment);
+
+			form.appendChild(inputField);
+			document.body.appendChild(form);
+			form.submit();
+		}
+		
+
+		// 部署削除用のJavaScript
+		function deleteDepartment(idDepartment) {
+			const form = document.createElement('form');
+			form.setAttribute('method', 'post');
+			form.setAttribute('action', 'deleteDepartmentInput'); // Delete Controller ၏ URL သို့မဟုတ် Path
+
+			const inputField = document.createElement("input");
+			inputField.setAttribute("type", "hidden");
+			inputField.setAttribute("name", "idDepartment");
+			inputField.setAttribute("value", idDepartment);
+
+			form.appendChild(inputField);
+			document.body.appendChild(form);
+			form.submit();
+		}
+	</script>
 </body>
-<script type="text/javascript">
 
-    function clearInput() {
-        document.getElementById('idDepartment').value = '';
-        document.getElementById('nmDepartment').value = '';
-        document.getElementById('idDepartment').selectedIndex = 0;
-    }
-
-
-</script>
 </html>

src/main/resources/templates/selectEmployee.html

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

src/main/resources/templates/updateDepartmentInput.html

@@ -2,87 +2,74 @@
 <html xmlns:th="http://www.thymeleaf.org">
 
 <head>
-
+	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+	<!-- 外部のスクリプトファイルを読み込む -->
-    <!-- 外部のスクリプトファイルを読み込む -->
+	<script th:src="@{/js/common.js}"></script>
-    <script th:src="@{/js/common.js}"></script>
+	<!-- CSSの読み込み -->
-    <!-- CSSの読み込み -->
+	<link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel="stylesheet" th:href="@{/css/all.css}">
+	<link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+	<title>部署情報更新</title>
-    <title>部署情報更新</title>
 </head>
 
 <body>
-<h1>
+	<h1>
-    部署情報更新　　　
+		部署情報更新
-    <div class="rightSection">
+		<div class="rightSection">
-        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
+		</div>
-</h1>
+	</h1>
-<form action="/updateDepartmentResult"
+	<form action="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-      method="post"
+		th:object="${departmentForm}">
-      onsubmit="return confirm('本当によろしいですか？');"
+		<div class="msgBox error" th:if="${messageError != null}">
-      th:object="${departmentFormList}"
+			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
- > 
+		</div>
-    <div class="msgBox error" th:if="${messageError != null}">
+		<table>
-        <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
+			<tr>
-    </div>
+				<th class="header">部署ID</th>
-    <table>
+				<td>
-        <tr>
+					<label>
-            <th class="header">部署ID</th>
+						<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
-            <td>
+					</label>
-                <label>
+				</td>
-                    <input class="readOnly"
+			</tr>
-                           readonly="readonly"
+			<tr>
-                           th:field="*{idDepartment}"
+				<th class="header">部署名</th>
-                           type="text"
+				<td>
-                    />
+					<label>
-                </label>
+						<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-            </td>
+							type="text" />
-        </tr>
+					</label>
-        <tr>
+				</td>
-            <th class="header">部署名</th>
+			</tr>
-            <td>
+			<tr>
-                <label>
+				<td class="btnArea" colspan="2">
-                    <input maxlength="50"
+					<input type="submit" value="更新" />
-                           placeholder="部署名"
+				</td>
-                           required="required"
+			</tr>
-                           th:field="*{nmDepartment}"
+		</table>
-                           type="text"
+	</form>
-                    />
+	<a href="javascript:selectSubmit()">一覧に戻る</a>
-                </label>
-            </td>
-        </tr>
-        <tr>
-            <td class="btnArea" colspan="2">
-                <input type="submit" value="更新"/>
-            </td>
-        </tr>
-    </table>
-</form>
-<a href="javascript:selectSubmit()">一覧に戻る</a>
 </body>
 
 <script>
-    function selectSubmit() {
+	function selectSubmit() {
-        const form = document.createElement('form');
+		const form = document.createElement('form');
-        form.setAttribute('method', 'post');
+		form.setAttribute('method', 'post');
-        form.setAttribute('action', 'departmentAll');
+		form.setAttribute('action', 'selectDepartment');
 
-        // 動的送信用のHidden
+		// 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		const inputField = document.createElement("input");
-        const inputField = document.createElement("input");
+		inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("value", "selectDepartment");
-        inputField.setAttribute("value", "departmentAll");
 
-        form.appendChild(inputField);
+		form.appendChild(inputField);
 
-        // フォームをDOMに追加
+		// フォームをDOMに追加
-        document.body.appendChild(form);
+		document.body.appendChild(form);
-
-        form.submit();
-    }
 
+		form.submit();
+	}
 </script>
+
 </html>