"부서 관리" 및 "사용자 관리" 프론트 완료

이민희

2021-11-05 fe1b9e8b4e54fb22022a0d13cc57b72bc8ba9840

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

@@ -62,7 +62,7 @@

    // 부서 목록을 가져온다.
    @Override
    public List<DepartmentManageVo> findDepartment(Map<String, Object> resJsonData,
    public List<DepartmentManageVo>findDepartment(Map<String, Object> resJsonData,
                                                   DepartmentManageCondition condition, Pageable pageable) {
        condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
        condition.setPageSize(pageable.getPageSize());
@@ -98,6 +98,11 @@
            throw new OwlRuntimeException(
                    this.messageAccessor.getMessage(MsgConstants.PROJECT_REMOVE_NOT_SELECT));
        }

        for (Long departmentId : departmentManageForm.getRemoveIds()) {
            this.departmentManageRepository.deleteById(departmentId);
        }

        this.departmentManageRepository.flush();
    }

@@ -106,8 +111,9 @@
    public void detailDepartment(Map<String, Object> resJsonData, DepartmentManageCondition departmentManageCondition) {
        DepartmentManageVo departmentManageVo = new DepartmentManageVo();

        if (departmentManageVo.getId() != null) {
            DepartmentManage departmentManage = this.getDepartment(departmentManageCondition.getId());
        Long departmentId = departmentManageCondition.getId();
        if (departmentId != null) {
            DepartmentManage departmentManage = this.getDepartment(departmentId);
            departmentManageVo = ConvertUtil.copyProperties(departmentManage, DepartmentManageVo.class);
        }
        resJsonData.put(Constants.RES_KEY_CONTENTS, departmentManageVo);