From 8076639088a150474da9e0584b733673b3065fed Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 20 12월 2021 11:41:16 +0900
Subject: [PATCH] - 이슈상세에서 하위이슈 추가 검색시 상위 이슈는 검색 리스트에서 나오지 말아야함 - 이슈상세에서 연관 이슈/하위 이슈 리스트 전체 불러오기
---
src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
index 7e6ecaa..2e4602d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -13,10 +13,12 @@
import kr.wisestone.owl.domain.Department;
import kr.wisestone.owl.domain.SystemEmail;
import kr.wisestone.owl.domain.User;
+import kr.wisestone.owl.domain.UserDepartment;
import kr.wisestone.owl.domain.enumType.EmailType;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.repository.SystemEmailRepository;
import kr.wisestone.owl.service.SystemEmailService;
+import kr.wisestone.owl.service.UserDepartmentService;
import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.util.*;
import org.apache.commons.io.FilenameUtils;
@@ -61,6 +63,9 @@
@Autowired
private SpringTemplateEngine springTemplateEngine;
+
+ @Autowired
+ private UserDepartmentService userDepartmentService;
@Override
protected JpaRepository<SystemEmail, Long> getRepository() {
@@ -332,6 +337,13 @@
}
if (excludeCheck) {
+ /*List<UserDepartment> userDepartments = this.userDepartmentService.getUserDepartments(department.getId());
+ if(userDepartments != null){
+ for (UserDepartment userDepartment : userDepartments){
+ User user = this.userService.getUser(userDepartment.getUserId());
+ results.add(user.getAccount());
+ }
+ }*/
results.add(department.getDepartmentName());
}
}
--
Gitblit v1.8.0