사용자 관리 부서 상세 백앤드 수정

wyu

2021-11-11 9f7091d2bf6e1353e3e747f3db49a0b933c2bd1d

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

@@ -6,6 +6,7 @@
import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.form.DepartmentForm;
import kr.wisestone.owl.web.form.UserDepartmentForm;
import org.springframework.ui.Model;
import com.google.common.collect.Lists;
import kr.wisestone.owl.common.ExcelConditionCheck;
@@ -105,17 +106,10 @@
        }

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

            this.departmentRepository.deleteById(id);
            this.departmentRepository.flush();
        }
        this.departmentRepository.flush();
    }



    // 부서 목록을 엑셀로 다운로드 한다.
@@ -171,7 +165,6 @@
        return department;
    }


    //  삭제 할 부서 유저가 사용하고 있는지 확인
    @Override
    public boolean department(Long Id) {
@@ -183,13 +176,13 @@
        return this.departmentMapper.findByDepartmentIds(condition);
    }


    //  검색 결과를 DepartmentVo 로 변환한다.
    private List<DepartmentVo> convertDepartmentVoToMap(List<Map<String, Object>> results, Long totalDepartmentsCount, Pageable pageable, Map<String, Object> resJsonData) {
        List<DepartmentVo> departmentVos = Lists.newArrayList();

        for (Map<String, Object> result : results) {
            DepartmentVo departmentVo = ConvertUtil.convertMapToClass(result, DepartmentVo.class);
            departmentVo.setByName(departmentVo.getDepartmentName());
            departmentVos.add(departmentVo);
        }