From fe1b9e8b4e54fb22022a0d13cc57b72bc8ba9840 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 05 11월 2021 19:12:00 +0900
Subject: [PATCH] "부서 관리" 및 "사용자 관리" 프론트 완료
---
src/main/java/kr/wisestone/owl/service/impl/DepartmentManageServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/DepartmentManageServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/DepartmentManageServiceImpl.java
index db658d9..c1459c4 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentManageServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentManageServiceImpl.java
@@ -62,7 +62,7 @@
// 遺��꽌 紐⑸줉�쓣 媛��졇�삩�떎.
@Override
- public List<DepartmentManageVo> findDepartment(Map<String, Object> resJsonData,
+ public List<DepartmentManageVo>findDepartment(Map<String, Object> resJsonData,
DepartmentManageCondition condition, Pageable pageable) {
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
condition.setPageSize(pageable.getPageSize());
@@ -98,6 +98,11 @@
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.PROJECT_REMOVE_NOT_SELECT));
}
+
+ for (Long departmentId : departmentManageForm.getRemoveIds()) {
+ this.departmentManageRepository.deleteById(departmentId);
+ }
+
this.departmentManageRepository.flush();
}
@@ -106,8 +111,9 @@
public void detailDepartment(Map<String, Object> resJsonData, DepartmentManageCondition departmentManageCondition) {
DepartmentManageVo departmentManageVo = new DepartmentManageVo();
- if (departmentManageVo.getId() != null) {
- DepartmentManage departmentManage = this.getDepartment(departmentManageCondition.getId());
+ Long departmentId = departmentManageCondition.getId();
+ if (departmentId != null) {
+ DepartmentManage departmentManage = this.getDepartment(departmentId);
departmentManageVo = ConvertUtil.copyProperties(departmentManage, DepartmentManageVo.class);
}
resJsonData.put(Constants.RES_KEY_CONTENTS, departmentManageVo);
--
Gitblit v1.8.0