Merge remote-tracking branch 'origin/master'

jhjang

2021-12-14 fe2b018f2c33d4444ed8a9c731f78e8f9ec6aadc

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