부서삭제 오류 해결

이민희

2021-12-13 cfc9e71ae55196920b3103d5a4dd9102be0ef69e

부서삭제 오류 해결

 src/main/java/kr/wisestone/owl/mapper/DepartmentMapper.java

@@ -21,8 +21,6 @@

    Long findBydepartmentId(Long Id);

    Long countInDepartment(Long Id);

    List<Map<String, Object>> findByDepartmentIds(UserCondition condition);

    List<Map<String, Object>> findProjectDepartment(DepartmentCondition departmentCondition);

 src/main/java/kr/wisestone/owl/repository/DepartmentRepository.java

@@ -2,7 +2,8 @@

import kr.wisestone.owl.domain.Department;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.query.Param;

public interface DepartmentRepository extends JpaRepository<Department, Long> {

    Long countById(@Param("id")Long id);
}

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

@@ -2,6 +2,7 @@

import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.mapper.DepartmentMapper;
import kr.wisestone.owl.repository.UserDepartmentRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.UserCondition;
@@ -38,6 +39,9 @@

    @Autowired
    private DepartmentRepository departmentRepository;

    @Autowired
    private UserDepartmentRepository userDepartmentRepository;

    @Autowired
    private DepartmentMapper departmentMapper;
@@ -233,7 +237,12 @@

    @Override
    public boolean countInDepartment(Long id) {
        return this.departmentMapper.countInDepartment(id) > 0;
        boolean result = false;
        List<UserDepartment> usingDepartments = this.userDepartmentRepository.findByDepartmentId(id);
        if(usingDepartments != null && usingDepartments.size() > 0){
            result = true;
        }
        return result;
    }

    //  DepartmentVos 데이터를 엑셀에서 표시할 수 있는 데이터로 변경한다.

 src/main/webapp/views/companyField/companyFieldAdd.html

@@ -42,7 +42,7 @@
                                    page="vm.autoCompletePage.ispField.page"
                                    total-page="vm.autoCompletePage.ispField.totalPage"
                                    input-disabled="false"
                                    translation-texts="{ empty : 'common.emptyHosting' }"
                                    translation-texts="{ empty : 'common.emptyIsp' }"
                                    broad-cast="ispFieldEvent"
                                    extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
                    type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>

 src/main/webapp/views/companyField/companyFieldModify.html

@@ -41,7 +41,7 @@
                                        page="vm.autoCompletePage.ispField.page"
                                        total-page="vm.autoCompletePage.ispField.totalPage"
                                        input-disabled="false"
                                        translation-texts="{ empty : 'common.emptyHosting' }"
                                        translation-texts="{ empty : 'common.emptyIsp' }"
                                        broad-cast="ispFieldEvent"
                                        extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
                    type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>

 src/main/webapp/views/issue/issueListNormal.html

@@ -336,8 +336,8 @@

                            <!--    우측  -->
                            <div class="col-5" >
                                <span class="issue-detail-label" style="position: relative; left: 18.8rem; bottom: 5px"><span style="color: #0a7cf8">◆</span> 완료 이슈 숨기기</span>
                                <label class='switch' style="left: 19.3rem"><input type='checkbox' ng-model='vm.hideIssue' ng-click='fn.getPageList(0)'>
                                <span class="issue-detail-label" style="position: relative; left: 16.8rem; bottom: 5px"><span style="color: #0a7cf8">◆</span> 완료 이슈 숨기기</span>
                                <label class='switch' style="left: 17.3rem"><input type='checkbox' ng-model='vm.hideIssue' ng-click='fn.getPageList(0)'>
                                    <span class='slider round'></span>
                                </label>
                                <form class="form-inline justify-content-sm-end  pull-right" method="post" action="/issue/downloadExcel" name="issueListForm" >