From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueDepartmentServiceImpl.java | 17 +++++++++++------
1 files changed, 11 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..1390d02 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueDepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueDepartmentServiceImpl.java
@@ -1,10 +1,7 @@
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;
@@ -42,6 +39,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 +74,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);
}
--
Gitblit v1.8.0