Merge remote-tracking branch 'origin/master'

jhjang

2021-11-15 934cc8834e3b7063320922a136b0d25809f7d187

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

@@ -1,7 +1,10 @@
package kr.wisestone.owl.service.impl;

import kr.wisestone.owl.domain.Department;
import kr.wisestone.owl.domain.UserDepartment;
import kr.wisestone.owl.domain.UserLevel;
import kr.wisestone.owl.mapper.DepartmentMapper;
import kr.wisestone.owl.service.UserDepartmentService;
import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.UserCondition;
@@ -40,7 +43,10 @@
    private DepartmentMapper departmentMapper;

    @Autowired
    private UserService userService;
    private DepartmentService departmentService;

    @Autowired
    private UserDepartmentService userDepartmentService;

    @Autowired
    private WorkspaceService workspaceService;
@@ -106,9 +112,14 @@
        }

        for (Long id : departmentForm.getRemoveIds()) {
            this.departmentRepository.deleteById(id);
            this.departmentRepository.flush();
            if (!this.departmentService.countInDepartment(id)) {
                this.departmentRepository.deleteById(id);
            } else {
                throw new OwlRuntimeException(
                        this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE));
            }
        }
        this.departmentRepository.flush();
    }


@@ -147,6 +158,12 @@

    }

    @Override
    public boolean countInDepartment(Long id) {
        return this.departmentMapper.countInDepartment(id) > 0;
    }


    // 사용자 부서 ID로 조회한다.
    @Override
    public Department getDepartment(Long id) {
@@ -163,12 +180,6 @@
        }

        return department;
    }

    //  삭제 할 부서 유저가 사용하고 있는지 확인
    @Override
    public boolean department(Long Id) {
        return this.departmentMapper.findBydepartmentId(Id) > 0;
    }

    @Override