Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-12-16 15b5b36643a525950631af0c0f0edf66c08ed968

Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

 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);

 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);
}

 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);
        }
    }

 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);    //  이슈 상세 정보를 셋팅한다.


 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"));

 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;
                                    }

 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"

 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">