Merge remote-tracking branch 'origin/master'

jhjang

2021-12-14 fe2b018f2c33d4444ed8a9c731f78e8f9ec6aadc

 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 UserDepartmentService userDepartmentService;

    @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.userDepartmentService.findByDepartmentId(id);
        if(usingDepartments != null && usingDepartments.size() > 0){
            result = true;
        }
        return result;
    }

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