From d78323a9138aab73f9f1b25e0a74283780176452 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 20:43:47 +0900
Subject: [PATCH] - 이슈전체보기/이슈프로젝트보기 권한 생성 - 워크스페이스 권한을 가진 사용자 OWL정보 오류 해결
---
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
index 1d7dbc7..2cd7eef 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -1,6 +1,7 @@
package kr.wisestone.owl.service.impl;
import kr.wisestone.owl.domain.*;
+import kr.wisestone.owl.domain.enumType.IssueHistoryType;
import kr.wisestone.owl.mapper.IssueIspMapper;
import kr.wisestone.owl.repository.IssueIspRepository;
import kr.wisestone.owl.service.*;
@@ -28,6 +29,9 @@
private IspFieldService ispFieldService;
@Autowired
+ private IssueHistoryService issueHistoryService;
+
+ @Autowired
private IssueIspMapper issueIspMapper;
@Override
@@ -44,18 +48,35 @@
Map<String, Object> param = issueIspFields.get(0);
if (param != null) {
- IssueIsp newIssueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class);
- newIssueIsp.setIssue(issue);
IspField ispField = this.ispFieldService.getIsp(MapUtil.getLong(param, "ispId"));
- newIssueIsp.setIspField(ispField);
Set<IssueIsp> issueIsps = issue.getIssueIspFields();
- if (issueIsps != null && issueIsps.size() > 0) {
- IssueIsp oldIssueIsp = issueIsps.iterator().next();
- ConvertUtil.copyProperties(newIssueIsp, oldIssueIsp);
- }
+ IssueIsp issueIsp = null;
- this.issueIspRepository.saveAndFlush(newIssueIsp);
+ if (issueIsps != null && issueIsps.size() > 0) {//�닔�젙 �븷 寃쎌슦
+ issueIsp = issueIsps.iterator().next();
+ // 蹂�寃� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+
+ issueIsp.setIspField(ispField);
+ issueIsp.setName(MapUtil.getString(param, "name"));
+ issueIsp.setEmail(MapUtil.getString(param, "email"));
+ issueIsp.setCode(MapUtil.getString(param, "code"));
+ issueIsp.setManager(MapUtil.getString(param, "manager"));
+ issueIsp.setTel(MapUtil.getString(param, "tel"));
+ issueIsp.setMemo(MapUtil.getString(param, "memo"));
+ } else {//異붽� �븷 寃쎌슦
+ issueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class);
+ issueIsp.setIssue(issue);
+ issueIsp.setIspField(ispField);
+ // 異붽� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ }
+ this.issueIspRepository.saveAndFlush(issueIsp);
}
}
}
--
Gitblit v1.8.0