diff --git a/src/main/java/com/example/rhizome/app/domain/service/DeleteDepartment.java b/src/main/java/com/example/rhizome/app/domain/service/DeleteDepartment.java new file mode 100644 index 0000000..3c6ce34 --- /dev/null +++ b/src/main/java/com/example/rhizome/app/domain/service/DeleteDepartment.java @@ -0,0 +1,5 @@ +package com.example.rhizome.app.domain.service; + +public interface DeleteDepartment { + void deleteDepartment(Integer idDepartment); +} diff --git a/src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDeparmentImpl.java b/src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDeparmentImpl.java new file mode 100644 index 0000000..178e38b --- /dev/null +++ b/src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDeparmentImpl.java @@ -0,0 +1,34 @@ +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); + } + +} diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/DeleteDepartmentController.java b/src/main/java/com/example/rhizome/app/presentation/controller/DeleteDepartmentController.java new file mode 100644 index 0000000..946d363 --- /dev/null +++ b/src/main/java/com/example/rhizome/app/presentation/controller/DeleteDepartmentController.java @@ -0,0 +1,135 @@ +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; + +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.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.LoginUserForm; +import com.example.rhizome.app.presentation.form.MessageForm; + +/** + * 削除処理のコントロータ + */ +@Controller +public class DeleteDepartmentController { + + // ログ出力用インスタンス + private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName()); + + // エラーメッセージ用の定数フィールド + private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; + final String UNKNOWN_ID = "削除対象のIDが不明です。"; + final String DELETE_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除できません。"; + final String DELETE_COMPLETE = "削除しました。"; + + HttpSession httpSession; + DeleteDepartment deleteDepartment; + SearchDepartment searchDepartment; + SearchEmployee searchEmployee; + + @Autowired + public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment, + HttpSession httpSession, SearchEmployee searchEmployee) { + this.httpSession = httpSession; + this.deleteDepartment = deleteDepartment; + this.searchDepartment = searchDepartment; + this.searchEmployee = searchEmployee; + } + + /** + * 削除処理のコントローラ + * + * @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 { + if (idDepartment == null) { + model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, UNKNOWN_ID); + model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, + DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); + return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML; + } else { + + // 部署一覧を取得し、画面に返す用のクラスに詰め替える + // 作成した部署一覧をセット + model.addAttribute( + PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, + DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); + + // 削除処理実施 + 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)); + + } +} diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java b/src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java index 07982f7..ba56144 100644 --- a/src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java +++ b/src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java @@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; -import com.example.rhizome.app.presentation.form.DepartmentForm; +import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.LoginUserForm; import com.example.rhizome.app.presentation.form.MessageForm; import org.springframework.beans.factory.annotation.Autowired; @@ -66,7 +66,7 @@ public class DeleteEmployeeController { // 作成した部署一覧をセット model.addAttribute( PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, - DepartmentForm.convertFrom(searchDepartment.selectAll()) + DepartmentInfoForm.convertFrom(searchDepartment.selectAll()) ); // 削除処理実施 diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java index 4cdf8d1..f21f230 100644 --- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java +++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java @@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl; import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; -import com.example.rhizome.app.presentation.form.DepartmentForm; +import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.InsertEmployeeForm; import com.example.rhizome.app.presentation.form.MessageForm; import org.springframework.beans.factory.annotation.Autowired; @@ -75,7 +75,7 @@ public class InsertEmployeeConfirmController { // 作成した部署一覧をセット model.addAttribute( PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, - DepartmentForm.convertFrom( + DepartmentInfoForm.convertFrom( searchDepartment.selectAll() )); diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java index a532295..456cab6 100644 --- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java +++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java @@ -8,7 +8,7 @@ import com.example.rhizome.app.domain.service.impl.RegisterEmployeeImpl; import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; -import com.example.rhizome.app.presentation.form.DepartmentForm; +import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.InsertEmployeeForm; import com.example.rhizome.app.presentation.form.MessageForm; import org.springframework.beans.factory.annotation.Autowired; @@ -71,7 +71,7 @@ public class InsertEmployeeController { // 作成した部署一覧をセット model.addAttribute( PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, - DepartmentForm.convertFrom( + DepartmentInfoForm.convertFrom( searchDepartment.selectAll() )); diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeInputController.java b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeInputController.java index fab6082..a79b7b9 100644 --- a/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeInputController.java +++ b/src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeInputController.java @@ -6,7 +6,7 @@ import com.example.rhizome.app.domain.service.RegisterEmployee; import com.example.rhizome.app.domain.service.SearchDepartment; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; -import com.example.rhizome.app.presentation.form.DepartmentForm; +import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.InsertEmployeeForm; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -64,7 +64,7 @@ public class InsertEmployeeInputController { try { // 部署コードリストを作成し、画面に返す値としてセット - model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll())); + model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); // パラメータをセット model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm); diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java b/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java index 256d718..20dca14 100644 --- a/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java +++ b/src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java @@ -18,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.DepartmentForm; +import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.SearchConditionDepartment; @Controller @@ -63,11 +63,11 @@ public class SelectDepartmentController { // 作成した部署一覧をセット model.addAttribute( PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, - DepartmentForm.convertFrom(searchDepartment.selectAll())); + DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); // 検索条件を元に検索を実施 // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット - model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom( + model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom( searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment)))); // 検索ページに遷移 return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML; @@ -101,11 +101,11 @@ public class SelectDepartmentController { // 作成した部署一覧をセット model.addAttribute( PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, - DepartmentForm.convertFrom(searchDepartment.selectAll())); + DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); // 検索条件を元に検索を実施 model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, - DepartmentForm.convertFrom( + DepartmentInfoForm.convertFrom( searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment())))); // 検索ページに遷移 diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java b/src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java index 1d02651..2f8041d 100644 --- a/src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java +++ b/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.DepartmentForm; +import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.EmployeeInfoForm; import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm; @@ -67,7 +67,7 @@ public class SelectEmployeeController { // 作成した部署一覧をセット model.addAttribute( PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, - DepartmentForm.convertFrom(searchDepartment.selectAll()) + DepartmentInfoForm.convertFrom(searchDepartment.selectAll()) ); // 検索条件を元に検索を実施 @@ -106,7 +106,7 @@ public class SelectEmployeeController { // 作成した部署一覧をセット model.addAttribute( PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, - DepartmentForm.convertFrom(searchDepartment.selectAll()) + DepartmentInfoForm.convertFrom(searchDepartment.selectAll()) ); // 検索条件を元に検索を実施 diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeController.java b/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeController.java index 1b43d74..521bc18 100644 --- a/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeController.java +++ b/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeController.java @@ -8,7 +8,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment; import com.example.rhizome.app.domain.service.SearchEmployeeInfo; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; -import com.example.rhizome.app.presentation.form.DepartmentForm; +import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.MessageForm; import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm; import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm; @@ -67,7 +67,7 @@ public class UpdateEmployeeController { try { // 部署一覧を取得し画面に返す値としてセット - model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll())); + model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); // id を条件に更新対象のレコードを検索、取得する List employeeInfoList = searchEmployeeInfo.searchBy( diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeResultController.java b/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeResultController.java index 7f0066c..fea33cb 100644 --- a/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeResultController.java +++ b/src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeResultController.java @@ -11,7 +11,7 @@ import com.example.rhizome.app.domain.service.UpdateEmployee; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; -import com.example.rhizome.app.presentation.form.DepartmentForm; +import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.LoginUserForm; import com.example.rhizome.app.presentation.form.MessageForm; import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm; @@ -91,7 +91,7 @@ public class UpdateEmployeeResultController { try { // 部署一覧取得 - model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll())); + model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); // パスワードが仕様を満たしているか確認 String error = UpdateEmployeeInfoForm.validatePassword( diff --git a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java b/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java index 5a03c8f..8da5999 100644 --- a/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java +++ b/src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java @@ -46,7 +46,7 @@ public class TransitionTargetPageNameKeyword { 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 @@ -64,7 +64,6 @@ public class TransitionTargetPageNameKeyword { INDEX_LOGIN, LOGOUT, DO_LOGIN, - DELETE_EMPLOYEE, INSERT_EMPLOYEE_INPUT, INSERT_EMPLOYEE_CONFIRM, INSERT_EMPLOYEE, @@ -74,7 +73,8 @@ public class TransitionTargetPageNameKeyword { SHOW_UPDATE_EMPLOYEE, UPDATE_EMPLOYEE_RESULT, SELECT_DEPARTMENT_INFO, - SELECT_DEPARTMENT_INFO_FORM_EMPTY); + SELECT_DEPARTMENT_INFO_FORM_EMPTY, + DELETE_DEPARTMENT); } diff --git a/src/main/java/com/example/rhizome/app/presentation/form/DepartmentForm.java b/src/main/java/com/example/rhizome/app/presentation/form/DepartmentInfoForm.java similarity index 74% rename from src/main/java/com/example/rhizome/app/presentation/form/DepartmentForm.java rename to src/main/java/com/example/rhizome/app/presentation/form/DepartmentInfoForm.java index 6648423..215eb08 100644 --- a/src/main/java/com/example/rhizome/app/presentation/form/DepartmentForm.java +++ b/src/main/java/com/example/rhizome/app/presentation/form/DepartmentInfoForm.java @@ -13,7 +13,7 @@ import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor -public class DepartmentForm { +public class DepartmentInfoForm { /** * 部署ID */ @@ -30,8 +30,8 @@ public class DepartmentForm { * @param department business 層の Department インスタンス * @return 画面用（presentation 層）の DepartmentForm インスタンス */ - public static DepartmentForm convertFrom(Department department) { - return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment()); + public static DepartmentInfoForm convertFrom(Department department) { + return new DepartmentInfoForm(department.getIdDepartment(), department.getNmDepartment()); } /** @@ -41,7 +41,7 @@ public class DepartmentForm { * @param departmentList business 層の Department インスタンスのリスト * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト */ - public static List convertFrom(List departmentList) { - return departmentList.stream().map(DepartmentForm::convertFrom).toList(); + public static List convertFrom(List departmentList) { + return departmentList.stream().map(DepartmentInfoForm::convertFrom).toList(); } } diff --git a/src/main/resources/templates/selectDepartment b/src/main/resources/templates/selectDepartment deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/templates/selectDepartment.html b/src/main/resources/templates/selectDepartment.html index 8205f9b..af24a99 100644 --- a/src/main/resources/templates/selectDepartment.html +++ b/src/main/resources/templates/selectDepartment.html @@ -21,9 +21,7 @@ -
+
@@ -71,6 +69,7 @@ 部署ID 部署名 + 操作 @@ -78,6 +77,14 @@ + + + + + + +