From 261950c3d8e20fb94141c03b37a2872f75477831 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 14 1월 2022 21:07:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueDepartmentServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueDepartmentServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueDepartmentServiceImpl.java
index 5835a65..34d1557 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueDepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueDepartmentServiceImpl.java
@@ -1,16 +1,14 @@
package kr.wisestone.owl.service.impl;
import com.google.common.collect.Lists;
-import kr.wisestone.owl.domain.Issue;
-import kr.wisestone.owl.domain.IssueDepartment;
-import kr.wisestone.owl.domain.IssueUser;
-import kr.wisestone.owl.domain.Workspace;
+import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.mapper.IssueDepartmentMapper;
import kr.wisestone.owl.mapper.IssueUserMapper;
import kr.wisestone.owl.repository.IssueDepartmentRepository;
import kr.wisestone.owl.service.IssueDepartmentService;
import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.util.MapUtil;
+import kr.wisestone.owl.vo.DepartmentVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +40,14 @@
@Override
@Transactional
public void modifyIssueDepartment(Issue issue, Workspace workspace, List<Long> departmentIds) {
+ User user = this.webAppUtil.getLoginUserObject();
+ modifyIssueDepartment(issue, user, workspace, departmentIds);
+ }
+
+ // �씠�뒋 �떞�떦遺��꽌瑜� 蹂�寃쏀븳�떎.
+ @Override
+ @Transactional
+ public void modifyIssueDepartment(Issue issue, User user, Workspace workspace, List<Long> departmentIds) {
List<Long> oldDepartmentIds = Lists.newArrayList();
// �씠�쟾 �떞�떦 遺��꽌
@@ -69,8 +75,8 @@
issueAssigneeMap.put("departmentId", departmentId); //�떞�떦遺��꽌
issueAssigneeMap.put("issueId", issue.getId());
issueAssigneeMap.put("workspaceId", workspace.getId());
- issueAssigneeMap.put("registerId", this.webAppUtil.getLoginId());
- issueAssigneeMap.put("modifyId", this.webAppUtil.getLoginId());
+ issueAssigneeMap.put("registerId", user.getId());
+ issueAssigneeMap.put("modifyId", user.getId());
addIssueAssigneeMaps.add(issueAssigneeMap);
}
@@ -86,6 +92,13 @@
return this.issueDepartmentRepository.findByIssueId(issue.getId());
}
+ // �씠�뒋 �떞�떦遺��꽌 李얘린
+ @Override
+ @Transactional
+ public List<IssueDepartment> findByDepartmentId(Long departmentId) {
+ return this.issueDepartmentRepository.findByDepartmentId(departmentId);
+ }
+
@Override
@Transactional
public void insertIssueDepartment(List<Map<String, Long>> issueAssigneeMaps) {
--
Gitblit v1.8.0