From dc9b09a4ee390db471ba8b7dedc375a9c7e72ad3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 13 12월 2021 15:56:49 +0900
Subject: [PATCH] - 연관이슈 검색 시 다른 이슈 유형(다른 프로젝트)의 이슈도 검색 가능 하도록 수정 - 부서 삭제 코드 약간 수정
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 18 +++++++++---------
src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java | 4 ++--
src/main/java/kr/wisestone/owl/service/UserDepartmentService.java | 3 +++
src/main/java/kr/wisestone/owl/service/impl/UserDepartmentServiceImpl.java | 5 +++++
4 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/UserDepartmentService.java b/src/main/java/kr/wisestone/owl/service/UserDepartmentService.java
index c364fc5..b09e517 100644
--- a/src/main/java/kr/wisestone/owl/service/UserDepartmentService.java
+++ b/src/main/java/kr/wisestone/owl/service/UserDepartmentService.java
@@ -6,6 +6,7 @@
import kr.wisestone.owl.web.form.UserDepartmentForm;
import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.List;
import java.util.Map;
public interface UserDepartmentService extends AbstractService<UserDepartment, Long, JpaRepository<UserDepartment, Long>> {
@@ -13,4 +14,6 @@
void userDepartmentDetail(Map<String, Object> resJsonData, UserCondition make);
void userDepartmentModify(UserDepartmentForm userDepartmentForm);
+
+ List<UserDepartment> findByDepartmentId(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 60a7ac3..c7e7000 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
@@ -41,7 +41,7 @@
private DepartmentRepository departmentRepository;
@Autowired
- private UserDepartmentRepository userDepartmentRepository;
+ private UserDepartmentService userDepartmentService;
@Autowired
private DepartmentMapper departmentMapper;
@@ -238,7 +238,7 @@
@Override
public boolean countInDepartment(Long id) {
boolean result = false;
- List<UserDepartment> usingDepartments = this.userDepartmentRepository.findByDepartmentId(id);
+ List<UserDepartment> usingDepartments = this.userDepartmentService.findByDepartmentId(id);
if(usingDepartments != null && usingDepartments.size() > 0){
result = true;
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserDepartmentServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserDepartmentServiceImpl.java
index 09bdbb8..baa6a8a 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserDepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserDepartmentServiceImpl.java
@@ -89,6 +89,11 @@
this.userDepartmentRepository.saveAll(list);
}
+ @Override
+ public List<UserDepartment> findByDepartmentId(Long id) {
+ return this.userDepartmentRepository.findByDepartmentId(id);
+ }
+
// �궗�슜�옄 遺��꽌 ID濡� 議고쉶�븳�떎.
// @Override
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index dae28cc..638c1dd 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -133,13 +133,13 @@
function getIssueList(query, issueTypeId, excludeList, page, callBack) {
var conditions = {
name : query,
- issueTypeIds : (function () {
+ /*issueTypeIds : (function () {
var ids = [];
ids.push(issueTypeId);
return ids;
- })(),
+ })(),*/
excludeIds : (function () {
var excludeIds = [];
@@ -175,13 +175,13 @@
function getDownIssueList(query, issueTypeId, excludeList, page, callBack) {
var conditions = {
name : query,
- // issueTypeIds : (function () {
- // var ids = [];
- //
- // ids.push(issueTypeId);
- //
- // return ids;
- // })(),
+ issueTypeIds : (function () {
+ var ids = [];
+
+ ids.push(issueTypeId);
+
+ return ids;
+ })(),
excludeIds : (function () {
var excludeIds = [];
--
Gitblit v1.8.0