From 0b42a6126bb73a9f7c3b5e154c9021de43f9d8c5 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 11 11월 2021 17:13:29 +0900
Subject: [PATCH] 사용자의 부서 수정 기능 프론트
---
src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
index ec8e228..749724d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
@@ -4,6 +4,7 @@
import kr.wisestone.owl.mapper.DepartmentMapper;
import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.web.condition.DepartmentCondition;
+import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.form.DepartmentForm;
import org.springframework.ui.Model;
import com.google.common.collect.Lists;
@@ -104,16 +105,11 @@
}
for (Long id : departmentForm.getRemoveIds()) {
- if (!this.userService.useUserLevel(id)) {
- this.departmentRepository.deleteById(id);
- } else {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE));
- }
-
+ this.departmentRepository.deleteById(id);
+ this.departmentRepository.flush();
}
- this.departmentRepository.flush();
}
+
// 遺��꽌 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@Override
@@ -139,9 +135,9 @@
// code_ko_KR �뿉 code紐� �꽕�젙
ExportExcelVo excelInfo = new ExportExcelVo();
excelInfo.setFileName(this.messageAccessor.message("遺��꽌 紐⑸줉"));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentName", this.messageAccessor.message("departmentManage.departmentName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentDescription", this.messageAccessor.message("departmentManage.departmentDescription"), 20, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentCount", this.messageAccessor.message("departmentManage.departmentCount"), 3, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentName", this.messageAccessor.message("department.departmentName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentDescription", this.messageAccessor.message("department.departmentDescription"), 20, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentCount", this.messageAccessor.message("department.departmentCount"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(departmentVos);
@@ -168,13 +164,17 @@
return department;
}
-
// �궘�젣 �븷 遺��꽌 �쑀��媛� �궗�슜�븯怨� �엳�뒗吏� �솗�씤
@Override
public boolean department(Long Id) {
return this.departmentMapper.findBydepartmentId(Id) > 0;
}
+ @Override
+ public List<Map<String, Object>> findByDepartmentIds(UserCondition condition) {
+ return this.departmentMapper.findByDepartmentIds(condition);
+ }
+
// 寃��깋 寃곌낵瑜� DepartmentVo 濡� 蹂��솚�븳�떎.
private List<DepartmentVo> convertDepartmentVoToMap(List<Map<String, Object>> results, Long totalDepartmentsCount, Pageable pageable, Map<String, Object> resJsonData) {
--
Gitblit v1.8.0