- 연관이슈 검색 시 다른 이슈 유형(다른 프로젝트)의 이슈도 검색 가능 하도록 수정 - 부서 삭제 코드 약간 수정

이민희

2021-12-13 dc9b09a4ee390db471ba8b7dedc375a9c7e72ad3

- 연관이슈 검색 시 다른 이슈 유형(다른 프로젝트)의 이슈도 검색 가능 하도록 수정
- 부서 삭제 코드 약간 수정

 src/main/java/kr/wisestone/owl/service/UserDepartmentService.java

@@ -6,6 +6,7 @@
import kr.wisestone.owl.web.form.UserDepartmentForm;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;
import java.util.Map;

public interface UserDepartmentService extends AbstractService<UserDepartment, Long, JpaRepository<UserDepartment, Long>> {
@@ -13,4 +14,6 @@
    void userDepartmentDetail(Map<String, Object> resJsonData, UserCondition make);

    void userDepartmentModify(UserDepartmentForm userDepartmentForm);

    List<UserDepartment> findByDepartmentId(Long id);
}

 src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java

@@ -41,7 +41,7 @@
    private DepartmentRepository departmentRepository;

    @Autowired
    private UserDepartmentRepository userDepartmentRepository;
    private UserDepartmentService userDepartmentService;

    @Autowired
    private DepartmentMapper departmentMapper;
@@ -238,7 +238,7 @@
    @Override
    public boolean countInDepartment(Long id) {
        boolean result = false;
        List<UserDepartment> usingDepartments = this.userDepartmentRepository.findByDepartmentId(id);
        List<UserDepartment> usingDepartments = this.userDepartmentService.findByDepartmentId(id);
        if(usingDepartments != null && usingDepartments.size() > 0){
            result = true;
        }

 src/main/java/kr/wisestone/owl/service/impl/UserDepartmentServiceImpl.java

@@ -89,6 +89,11 @@
        this.userDepartmentRepository.saveAll(list);
    }

    @Override
    public List<UserDepartment> findByDepartmentId(Long id) {
        return this.userDepartmentRepository.findByDepartmentId(id);
    }


    // 사용자 부서 ID로 조회한다.
//    @Override

 src/main/webapp/scripts/components/utils/autoComplete.controller.js

@@ -133,13 +133,13 @@
                function getIssueList(query, issueTypeId, excludeList, page, callBack) {
                    var conditions = {
                        name : query,
                        issueTypeIds : (function () {
                        /*issueTypeIds : (function () {
                            var ids = [];

                            ids.push(issueTypeId);

                            return ids;
                        })(),
                        })(),*/
                        excludeIds : (function () {
                            var excludeIds = [];

@@ -175,13 +175,13 @@
                function getDownIssueList(query, issueTypeId, excludeList, page, callBack) {
                    var conditions = {
                        name : query,
                        // issueTypeIds : (function () {
                        //     var ids = [];
                        //
                        //     ids.push(issueTypeId);
                        //
                        //     return ids;
                        // })(),
                        issueTypeIds : (function () {
                            var ids = [];

                            ids.push(issueTypeId);

                            return ids;
                        })(),
                        excludeIds : (function () {
                            var excludeIds = [];