From 1bcea4755d662f243400ac916f43550a3bc13ded Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 15 11월 2021 10:10:13 +0900
Subject: [PATCH] 엑셀 이름 커밋

---
 src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 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 763d552..f9c2d2c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
@@ -1,7 +1,10 @@
 package kr.wisestone.owl.service.impl;
 
 import kr.wisestone.owl.domain.Department;
+import kr.wisestone.owl.domain.UserDepartment;
+import kr.wisestone.owl.domain.UserLevel;
 import kr.wisestone.owl.mapper.DepartmentMapper;
+import kr.wisestone.owl.service.UserDepartmentService;
 import kr.wisestone.owl.service.UserService;
 import kr.wisestone.owl.web.condition.DepartmentCondition;
 import kr.wisestone.owl.web.condition.UserCondition;
@@ -40,7 +43,10 @@
     private DepartmentMapper departmentMapper;
 
     @Autowired
-    private UserService userService;
+    private DepartmentService departmentService;
+
+    @Autowired
+    private UserDepartmentService userDepartmentService;
 
     @Autowired
     private WorkspaceService workspaceService;
@@ -106,9 +112,14 @@
         }
 
         for (Long id : departmentForm.getRemoveIds()) {
-            this.departmentRepository.deleteById(id);
-            this.departmentRepository.flush();
+            if (!this.departmentService.countInDepartment(id)) {
+                this.departmentRepository.deleteById(id);
+            } else {
+                throw new OwlRuntimeException(
+                        this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE));
+            }
         }
+        this.departmentRepository.flush();
     }
 
 
@@ -147,6 +158,12 @@
 
     }
 
+    @Override
+    public boolean countInDepartment(Long id) {
+        return this.departmentMapper.countInDepartment(id) > 0;
+    }
+
+
     // �궗�슜�옄 遺��꽌 ID濡� 議고쉶�븳�떎.
     @Override
     public Department getDepartment(Long id) {
@@ -163,12 +180,6 @@
         }
 
         return department;
-    }
-
-    //  �궘�젣 �븷 遺��꽌 �쑀��媛� �궗�슜�븯怨� �엳�뒗吏� �솗�씤
-    @Override
-    public boolean department(Long Id) {
-        return this.departmentMapper.findBydepartmentId(Id) > 0;
     }
 
     @Override

--
Gitblit v1.8.0