From 15b5b36643a525950631af0c0f0edf66c08ed968 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 16 12월 2021 11:08:05 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 11 ++++++++++-
src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.js | 6 +-----
src/main/java/kr/wisestone/owl/service/impl/IssueVersionServiceImpl.java | 8 +++++++-
src/main/java/kr/wisestone/owl/service/IssueService.java | 2 ++
src/main/java/kr/wisestone/owl/web/controller/ApiController.java | 3 ++-
src/main/java/kr/wisestone/owl/service/IssueVersionService.java | 3 +++
src/main/webapp/views/user/userDetail.html | 2 +-
src/main/webapp/custom_components/js-workflow/js-workflow.html | 2 +-
8 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index 8bc8349..242c011 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -24,6 +24,8 @@
void addIssueVersion(Long id);
+ void addIssueVersion(Long id, Long userId);
+
Issue addIssue(IssueForm issueForm, List<MultipartFile> files);
Issue addIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
diff --git a/src/main/java/kr/wisestone/owl/service/IssueVersionService.java b/src/main/java/kr/wisestone/owl/service/IssueVersionService.java
index 2c8728b..a8bd515 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueVersionService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueVersionService.java
@@ -2,6 +2,7 @@
import kr.wisestone.owl.domain.Issue;
import kr.wisestone.owl.domain.IssueVersion;
+import kr.wisestone.owl.domain.User;
import kr.wisestone.owl.web.condition.IssueVersionCondition;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -12,5 +13,7 @@
void addIssueVersion(Issue issue);
+ void addIssueVersion(Issue issue, User user);
+
void find(Map<String, Object> resJsonData, IssueVersionCondition issueVersionCondition);
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 61764f3..10d95d0 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -211,6 +211,15 @@
this.issueVersionService.addIssueVersion(issue);
}
+ @Override
+ @Transactional
+ public void addIssueVersion(Long id, Long userId) {
+ Issue issue = this.getIssue(id);
+ User user = this.userService.getUser(userId);
+ // �씠�뒋 踰꾩쟾 �깮�꽦
+ this.issueVersionService.addIssueVersion(issue, user);
+ }
+
private IssueForm convertToIssueForm(IssueApiForm issueApiForm, User user) {
if (issueApiForm.getIssueTypeId() == null) {
@@ -1560,7 +1569,7 @@
this.setParentIssue(issue,issueVo); //�긽�쐞 �씠�뒋 �젙蹂� �꽭�똿
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
- if (user != null && this.checkHasPermission(issueVo, issueVo.getUserVos(), user, issueVo.getDepartmentVos())) {
+ if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user, issueVo.getDepartmentVos())) {
issueVo.setModifyPermissionCheck(Boolean.TRUE);
}
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueVersionServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueVersionServiceImpl.java
index 0368e2b..34934da 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueVersionServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueVersionServiceImpl.java
@@ -48,8 +48,14 @@
@Override
@Transactional
public void addIssueVersion(Issue issue) {
+ this.addIssueVersion(issue, this.webAppUtil.getLoginUserObject());
+ }
+
+ // �씠�뒋 踰꾩쟾 �깮�꽦
+ @Override
+ @Transactional
+ public void addIssueVersion(Issue issue, User user) {
IssueVo issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
- User user = this.webAppUtil.getLoginUserObject();
this.issueService.setIssueDetail(issueVo, issue, user); // �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
diff --git a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
index ed16ccc..e221753 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
@@ -3,6 +3,7 @@
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.Issue;
+import kr.wisestone.owl.domain.User;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.service.IssueService;
import kr.wisestone.owl.util.ConvertUtil;
@@ -54,7 +55,7 @@
List<Issue> issues = this.issueService.addApiIssue(issueForm);
// 踰꾩쟾 �깮�꽦
for (Issue issue : issues) {
- this.issueService.addIssueVersion(issue.getId());
+ this.issueService.addIssueVersion(issue.getId(), issue.getRegisterId());
}
} else {
this.issueService.modifyIssue(issueForm, request.getFiles("file"));
diff --git a/src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.js b/src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.js
index 8680c81..4781931 100644
--- a/src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.js
+++ b/src/main/webapp/custom_components/js-autocomplete-multi/js-autocomplete-multi.js
@@ -101,11 +101,7 @@
var parentFound = false;
while (angular.isDefined(target) && target !== null && !parentFound && target.className !== null) {
- if (typeof target.className.split != 'function') {
- break;
- }
-
- if (_.contains(target.className.split(' '), 'multiselect-parent') && !parentFound) {
+ if (target.getElementsByClassName('multiselect-parent') && !parentFound) {
if (target === $dropdownTrigger) {
parentFound = true;
}
diff --git a/src/main/webapp/custom_components/js-workflow/js-workflow.html b/src/main/webapp/custom_components/js-workflow/js-workflow.html
index e855de5..eebb661 100644
--- a/src/main/webapp/custom_components/js-workflow/js-workflow.html
+++ b/src/main/webapp/custom_components/js-workflow/js-workflow.html
@@ -60,7 +60,7 @@
</div>
</div>
- <div class="form-group" ng-if="vm.activeTarget != null" ng-hide="vm.activeTarget.colorClass != null">
+ <div class="form-group" ng-if="vm.activeTarget != null" ng-show="vm.activeTarget.type === '01'">
<label><span translate="project.projectDepartment">遺��꽌紐�</span><span>[{{vm.activeTarget.name}}]</span></label>
<js-autocomplete-multi data-input-name="departments"
selected-model="vm.departments"
diff --git a/src/main/webapp/views/user/userDetail.html b/src/main/webapp/views/user/userDetail.html
index e481ab9..7da2c61 100644
--- a/src/main/webapp/views/user/userDetail.html
+++ b/src/main/webapp/views/user/userDetail.html
@@ -17,7 +17,7 @@
<div class="user-sub" ng-if="$root.isDefined($root.user.phone)">
<span translate="users.phoneNumber">�뿰�씫泥�</span> : {{$root.user.phone}}
</div>
- <div class="user-sub" ng-if="vm.myLevel != null">
+ <div class="user-sub form-text" ng-if="vm.myLevel != null">
<span translate="users.myLevel">�벑湲�</span> : {{vm.myLevel}}
</div>
<div class="user-sub" ng-if="vm.myDepartments != null">
--
Gitblit v1.8.0