From cfc9e71ae55196920b3103d5a4dd9102be0ef69e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 13 12월 2021 10:53:58 +0900
Subject: [PATCH] 부서삭제 오류 해결
---
src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java | 11 ++++++++++-
src/main/java/kr/wisestone/owl/repository/DepartmentRepository.java | 3 ++-
src/main/webapp/views/issue/issueListNormal.html | 4 ++--
src/main/java/kr/wisestone/owl/mapper/DepartmentMapper.java | 2 --
src/main/webapp/views/companyField/companyFieldModify.html | 2 +-
src/main/webapp/views/companyField/companyFieldAdd.html | 2 +-
6 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/mapper/DepartmentMapper.java b/src/main/java/kr/wisestone/owl/mapper/DepartmentMapper.java
index 452bb22..0f43f7d 100644
--- a/src/main/java/kr/wisestone/owl/mapper/DepartmentMapper.java
+++ b/src/main/java/kr/wisestone/owl/mapper/DepartmentMapper.java
@@ -21,8 +21,6 @@
Long findBydepartmentId(Long Id);
- Long countInDepartment(Long Id);
-
List<Map<String, Object>> findByDepartmentIds(UserCondition condition);
List<Map<String, Object>> findProjectDepartment(DepartmentCondition departmentCondition);
diff --git a/src/main/java/kr/wisestone/owl/repository/DepartmentRepository.java b/src/main/java/kr/wisestone/owl/repository/DepartmentRepository.java
index aa33730..aac092c 100644
--- a/src/main/java/kr/wisestone/owl/repository/DepartmentRepository.java
+++ b/src/main/java/kr/wisestone/owl/repository/DepartmentRepository.java
@@ -2,7 +2,8 @@
import kr.wisestone.owl.domain.Department;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.query.Param;
public interface DepartmentRepository extends JpaRepository<Department, Long> {
-
+ Long countById(@Param("id")Long id);
}
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..60a7ac3 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 UserDepartmentRepository userDepartmentRepository;
@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.userDepartmentRepository.findByDepartmentId(id);
+ if(usingDepartments != null && usingDepartments.size() > 0){
+ result = true;
+ }
+ return result;
}
// DepartmentVos �뜲�씠�꽣瑜� �뿊���뿉�꽌 �몴�떆�븷 �닔 �엳�뒗 �뜲�씠�꽣濡� 蹂�寃쏀븳�떎.
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index ed0d363..a73a0f8 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -42,7 +42,7 @@
page="vm.autoCompletePage.ispField.page"
total-page="vm.autoCompletePage.ispField.totalPage"
input-disabled="false"
- translation-texts="{ empty : 'common.emptyHosting' }"
+ translation-texts="{ empty : 'common.emptyIsp' }"
broad-cast="ispFieldEvent"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index 9909836..d9c912c 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -41,7 +41,7 @@
page="vm.autoCompletePage.ispField.page"
total-page="vm.autoCompletePage.ispField.totalPage"
input-disabled="false"
- translation-texts="{ empty : 'common.emptyHosting' }"
+ translation-texts="{ empty : 'common.emptyIsp' }"
broad-cast="ispFieldEvent"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index e81993d..9de5670 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -336,8 +336,8 @@
<!-- �슦痢� -->
<div class="col-5" >
- <span class="issue-detail-label" style="position: relative; left: 18.8rem; bottom: 5px"><span style="color: #0a7cf8">�뾾</span> �셿猷� �씠�뒋 �닲湲곌린</span>
- <label class='switch' style="left: 19.3rem"><input type='checkbox' ng-model='vm.hideIssue' ng-click='fn.getPageList(0)'>
+ <span class="issue-detail-label" style="position: relative; left: 16.8rem; bottom: 5px"><span style="color: #0a7cf8">�뾾</span> �셿猷� �씠�뒋 �닲湲곌린</span>
+ <label class='switch' style="left: 17.3rem"><input type='checkbox' ng-model='vm.hideIssue' ng-click='fn.getPageList(0)'>
<span class='slider round'></span>
</label>
<form class="form-inline justify-content-sm-end pull-right" method="post" action="/issue/downloadExcel" name="issueListForm" >
--
Gitblit v1.8.0