2段階_途中まで

.classpath

@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+	<classpathentry kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="optional" value="true"/>
@@ -14,20 +14,21 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<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="maven.pomderived" value="true"/>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

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

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

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

@@ -1,34 +0,0 @@
-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 DeleteDeparmentImpl implements DeleteDepartment{
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-    public DeleteDeparmentImpl(DepartmentRepository departmentRepository) {
-		 this.departmentRepository = departmentRepository;
-
-	}
-
-
-	/**
-	 * idDepartment を元に department データを削除
-	 *
-	 * @param idDepartmetn 削除対象のidDepartment
-	 */
-	public void deleteDepartment(Integer idDepartment) {
-		departmentRepository.deleteById(idDepartment);
-	}
-
-}

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

@@ -0,0 +1,22 @@
+package com.example.rhizome.app.domain.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.example.rhizome.app.domain.service.DeleteDepartment;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
+
+public class DeleteDepartmentImpl implements DeleteDepartment {
+	 DepartmentRepository departmentRepository;
+
+	    @Autowired
+	    public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
+	        this.departmentRepository = departmentRepository;
+	    }
+
+	    public void deleteDepartment(Integer idDepartment) {
+	        // ★考える：Repository のどのメソッドで「IDを指定して削除」できる？
+	        //          （お手本の DeleteEmployeeImpl を見る）
+	    	departmentRepository.deleteById(idDepartment);
+	    }
+
+}

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

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

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

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

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

@@ -1,25 +1,29 @@
 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;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
  */
+//サービスクラスとして登録
 @Service
+//トランザクション管理
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
 
+	//Repositoryを保持するフィールド
     DepartmentRepository departmentRepository;
 
     /**
@@ -67,6 +71,7 @@ public class SearchDepartmentImpl implements SearchDepartment {
      * @param searchConditionDepartment 検索条件
      * @return 検索結果のレコード
      */
+    @Override
     public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
         // 動的に検索条件を絞り込む
         // Specification は Criteria API の Predicate をラップしたもの

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

@@ -1,17 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-import java.util.List;
-
-import com.example.rhizome.app.domain.model.EmployeeInfo;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
-public interface searchDepartmentinfo {
-	List<EmployeeInfo> selectAll();
-
-    static List<EmployeeInfo> searchBy(SearchConditionDepartment searchConditionDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-}
-
-

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

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

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

@@ -1,11 +1,13 @@
 package com.example.rhizome.app.infra.repository;
 
-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;
 
+//DepartmentRntity: 部署の実体
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
+
 
 /**
  * Specification:
@@ -19,11 +21,15 @@ import org.springframework.stereotype.Repository;
  * CriteriaBuilder:条件式（Where句以降の条件）の部分のクエリを作るためのビルダーです。
  * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
  */
+
+//部署情報をデータベースから取得するRepository
+//                                           JpaRepositoryを継承する
 @Repository
 public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
 
-
+//部署IDの完全一致検索条件を作成する
     static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
+        //部署IDがnullなら条件を設定しない
         return idDepartment == null ?
                 null :
                 // 戻り値の型 Specification<DepartmentEntity> にキャスト
@@ -33,7 +39,9 @@ public interface DepartmentRepository extends JpaRepository<DepartmentEntity, In
                         (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
     }
 
+    //部署名の完全一致条件を作成する
     static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
+    	//部署名が未入力なら条件を設定しない
         return (nmDepartment == null || nmDepartment.isEmpty()) ?
                 null :
                 (Specification<DepartmentEntity>)

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

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

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

@@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ public class DeleteEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 削除処理実施

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

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

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

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

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

@@ -6,7 +6,7 @@ import com.example.rhizome.app.domain.service.RegisterEmployee;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -64,7 +64,7 @@ public class InsertEmployeeInputController {
 
         try {
             // 部署コードリストを作成し、画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
             // パラメータをセット
             model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);

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

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

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

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

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

@@ -18,7 +18,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.EmployeeInfoForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 
@@ -33,6 +33,8 @@ public class SelectEmployeeController {
     // エラーメッセージ用の定数フィールド
     private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
     
+    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
+
     HttpSession httpSession;
     SearchDepartment searchDepartment;
     SearchEmployeeInfo searchEmployeeInfo;
@@ -63,19 +65,22 @@ public class SelectEmployeeController {
 
         try {
         	
+
             // 部署一覧を取得し、画面に返す用のクラスに詰め替える
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 検索条件を元に検索を実施
+            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
             model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
             // 検索ページに遷移
             return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
 
 
+            
         } catch (Exception e) {
             // ログイン情報の破棄
             httpSession.invalidate();
@@ -106,7 +111,7 @@ public class SelectEmployeeController {
         // 作成した部署一覧をセット
         model.addAttribute(
                 PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                DepartmentForm.convertFrom(searchDepartment.selectAll())
         );
 
         // 検索条件を元に検索を実施

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

@@ -8,7 +8,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -67,7 +67,7 @@ public class UpdateEmployeeController {
 
         try {
             // 部署一覧を取得し画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
             // id を条件に更新対象のレコードを検索、取得する
             List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy(

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

@@ -11,7 +11,7 @@ import com.example.rhizome.app.domain.service.UpdateEmployee;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -91,7 +91,7 @@ public class UpdateEmployeeResultController {
         try {
 
             // 部署一覧取得
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
             // パスワードが仕様を満たしているか確認
             String error = UpdateEmployeeInfoForm.validatePassword(

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

@@ -7,90 +7,106 @@ 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 SELECT_DEPARTMENT_HTML = "/selectDepartment";
+    public static final String DEPARTMENT_HTML = "department";
-	public static final String ERROR_HTML = "error";
 
-	// 共通(Controller)
+    public static final String ERROR_HTML = "error";
-	public static final String INDEX_BLANK = "";
-	public static final String INDEX_SLASH = "/";
-	public static final String INDEX_LOGIN = "/login";
-	public static final String LOGOUT = "/logout";
-	public static final String DO_LOGIN = "/doLogin";
 
-	// 一般向け(Controller)
+    // 共通(Controller)
-	public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
+    public static final String INDEX_BLANK = "";
+    public static final String INDEX_SLASH = "/";
+    public static final String INDEX_LOGIN = "/login";
+    public static final String LOGOUT = "/logout";
+    public static final String DO_LOGIN = "/doLogin";
+//    public static final String DEPARTMENT_HTML = "/department";
 
-	// 管理者向け(Controller)
+    // 一般向け(Controller)
-	public static final String DELETE_EMPLOYEE = "/deleteEmployee";
+    public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
-	public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
-	public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
-	public static final String INSERT_EMPLOYEE = "/insertEmployee";
-	public static final String SHOW_MENU = "/showMenu";
-	public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
-	public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
-	public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
-	public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
-	public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
-	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY ="/departmentAll"; 
-	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-	// Department
-	// HTML
-	// Controller
 
-	/**
+    // 管理者向け(Controller)
-	 * 管理者向けのページリストを返す
+    public static final String DELETE_EMPLOYEE = "/deleteEmployee";
-	 *
+    public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
-	 * @return 管理者向けのページリスト
+    public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
-	 */
+    public static final String INSERT_EMPLOYEE = "/insertEmployee";
-	public static Set<String> getAdminPageList() {
+    public static final String SHOW_MENU = "/showMenu";
+    public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
+    public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
+    public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
+    public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
+    public static final String SHOW_DEPARTMENT = "/department";
+//    public static final String SELECT_DEPARTMENT = "/selectDepartment";
     
-		return Set.of(
-				INDEX_BLANK,
-				INDEX_SLASH,
-				INDEX_LOGIN,
-				LOGOUT,
-				DO_LOGIN,
-				INSERT_EMPLOYEE_INPUT,
-				INSERT_EMPLOYEE_CONFIRM,
-				INSERT_EMPLOYEE,
-				SHOW_MENU,
-				SELECT_EMPLOYEE_INFO,
-				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
-				SHOW_UPDATE_EMPLOYEE,
-				UPDATE_EMPLOYEE_RESULT,
-				SELECT_DEPARTMENT_INFO,
-				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
-				DELETE_DEPARTMENT);
 
-	}
 
-	/**
+    
-	 * 一般向けのページリストを返す
+
-	 *
+    // Department
-	 * @return 一般向けのページリスト
+    // HTML             実装手順書ステップ1-2通りの定数追加
-	 */
+    public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
-	public static Set<String> getUserPageList() {
+    
-		return Set.of(
+    // Controller       実装手順書ステップ1-2通りの定数追加 -> 管理者向けと重複、エラーでたため一旦コメアウト
-				INDEX_BLANK,
+    public static final String SELECT_DEPARTMENT = "/selectDepartment";
-				INDEX_SLASH,
+    
-				INDEX_LOGIN,
+ // ステップ2-3*TransitionTargetPageNameKeyword の Department(Controller) の枠に追記
-				LOGOUT,
+    public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-				DO_LOGIN,
+    
-				PERSONAL_UPDATE_RESULT);
+    public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-	}
+
+    /**
+     * 管理者向けのページリストを返す
+     *
+     * @return 管理者向けのページリスト
+     */
+    public static Set<String> getAdminPageList() {
+
+        return Set.of(
+                INDEX_BLANK,
+                INDEX_SLASH,
+                INDEX_LOGIN,
+                LOGOUT,
+                DO_LOGIN,
+                DELETE_EMPLOYEE,
+                INSERT_EMPLOYEE_INPUT,
+                INSERT_EMPLOYEE_CONFIRM,
+                INSERT_EMPLOYEE,
+                SHOW_MENU,
+                SELECT_EMPLOYEE_INFO,
+                SELECT_EMPLOYEE_INFO_FORM_EMPTY,
+                SHOW_UPDATE_EMPLOYEE,
+                UPDATE_EMPLOYEE_RESULT,
+                SELECT_DEPARTMENT              
+            
+        );
+    }
+
+    /**
+     * 一般向けのページリストを返す
+     *
+     * @return 一般向けのページリスト
+     */
+    public static Set<String> getUserPageList() {
+        return Set.of(
+                INDEX_BLANK,
+                INDEX_SLASH,
+                INDEX_LOGIN,
+                LOGOUT,
+                DO_LOGIN,
+                PERSONAL_UPDATE_RESULT,
+                SHOW_DEPARTMENT
+        );
+    }
 
 }

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

@@ -1,19 +1,21 @@
 package com.example.rhizome.app.presentation.form;
 
+import java.util.List;
+
 import com.example.rhizome.app.domain.model.Department;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 /**
  * 画面の表示に使う部署コード管理用のクラス
  */
+//            部署のフォーム
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class DepartmentInfoForm {
+public class DepartmentForm {
     /**
      * 部署ID
      */
@@ -30,8 +32,8 @@ public class DepartmentInfoForm {
      * @param department business 層の Department インスタンス
      * @return 画面用（presentation 層）の DepartmentForm インスタンス
      */
-    public static DepartmentInfoForm convertFrom(Department department) {
+    public static DepartmentForm convertFrom(Department department) {
-        return new DepartmentInfoForm(department.getIdDepartment(), department.getNmDepartment());
+        return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
     }
 
     /**
@@ -41,7 +43,7 @@ public class DepartmentInfoForm {
      * @param departmentList business 層の Department インスタンスのリスト
      * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト
      */
-    public static List<DepartmentInfoForm> convertFrom(List<Department> departmentList) {
+    public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
-        return departmentList.stream().map(DepartmentInfoForm::convertFrom).toList();
+        return departmentList.stream().map(DepartmentForm::convertFrom).toList();
     }
 }

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

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

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

@@ -0,0 +1,26 @@
+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;
+	
+	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm form) {
+		//SearchConditonDepartment();の中身：Formの2つの値を返す
+		return new SearchConditionDepartment(
+				form.getIdDepartment(),
+				form.getNmDepartment()
+				);
+	}
+}

src/main/resources/application.properties

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

src/main/resources/templates/menu.html

@@ -3,121 +3,137 @@
 
 <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>
+	    <style>
+			.container{
+				width: 100%;
+				overflow: hidden;
+			}
+			.column{
+				width: 48%;
+				float: left;
+				margin: 1%;
+			}
+		</style>
 
 </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">登録済みのユーザ一覧表示と更新、削除を行います。</td>
-			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i>部署検索</a>
+    </tr>
-			</td>
-			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
-		</tr>
 
-		<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 class="description">新規でユーザ追加を行います。</td>
-			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
+    </tr>
-			</td>
-			<td class="description">新規で部署追加を行います。</td>
 	
+	<tr>
+	    <td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
+	    </td>
+	    <td class="description">登録済みの部署一覧表示と更新、削除を行います。</td>
+	</tr>
 	
-	</table>
+	<tr>
+	    <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+	    <td class="description">新規で部署追加を行います。</td>
+	</tr>
+
+</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

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