From fe2b018f2c33d4444ed8a9c731f78e8f9ec6aadc Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 14 12월 2021 10:37:28 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 6c22513..c7e7000 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
@@ -2,6 +2,7 @@
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.mapper.DepartmentMapper;
+import kr.wisestone.owl.repository.UserDepartmentRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.UserCondition;
@@ -38,6 +39,9 @@
@Autowired
private DepartmentRepository departmentRepository;
+
+ @Autowired
+ private UserDepartmentService userDepartmentService;
@Autowired
private DepartmentMapper departmentMapper;
@@ -233,7 +237,12 @@
@Override
public boolean countInDepartment(Long id) {
- return this.departmentMapper.countInDepartment(id) > 0;
+ boolean result = false;
+ List<UserDepartment> usingDepartments = this.userDepartmentService.findByDepartmentId(id);
+ if(usingDepartments != null && usingDepartments.size() > 0){
+ result = true;
+ }
+ return result;
}
// DepartmentVos �뜲�씠�꽣瑜� �뿊���뿉�꽌 �몴�떆�븷 �닔 �엳�뒗 �뜲�씠�꽣濡� 蹂�寃쏀븳�떎.
--
Gitblit v1.8.0