From c8d436c6d85ea6f1e93c838a8b5a4690d0f075e4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 12 11월 2021 10:43:12 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index 911f3db..e4d2482 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -105,15 +105,9 @@
this.messageAccessor.getMessage(MsgConstants.COMPANY_REMOVE_NOT_SELECT));
}
for (Long id : companyFieldForm.getRemoveIds()) {
- if (!this.userService.useUserLevel(id)) {
- this.companyFieldRepository.deleteById(id);
- } else {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE));
- }
-
+ this.companyFieldRepository.deleteById(id);
+ this.companyFieldRepository.flush();
}
- this.companyFieldRepository.flush();
}
// �뾽泥� 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@@ -147,6 +141,7 @@
excelInfo.setDatas(companyFieldVos);
+ System.out.println(excelInfo);
model.addAttribute(Constants.EXCEL, excelInfo);
return new ModelAndView(this.excelView);
}
--
Gitblit v1.8.0