엑셀 이름 커밋

wyu

2021-11-15 1bcea4755d662f243400ac916f43550a3bc13ded

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

@@ -1,10 +1,15 @@
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;
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;
@@ -38,7 +43,10 @@
    private DepartmentMapper departmentMapper;

    @Autowired
    private UserService userService;
    private DepartmentService departmentService;

    @Autowired
    private UserDepartmentService userDepartmentService;

    @Autowired
    private WorkspaceService workspaceService;
@@ -104,16 +112,16 @@
        }

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

        }
        this.departmentRepository.flush();
    }


    // 부서 목록을 엑셀로 다운로드 한다.
    @Override
@@ -150,6 +158,12 @@

    }

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


    // 사용자 부서 ID로 조회한다.
    @Override
    public Department getDepartment(Long id) {
@@ -168,13 +182,10 @@
        return department;
    }


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


    //  검색 결과를 DepartmentVo 로 변환한다.
    private List<DepartmentVo> convertDepartmentVoToMap(List<Map<String, Object>> results, Long totalDepartmentsCount, Pageable pageable, Map<String, Object> resJsonData) {
@@ -182,6 +193,7 @@

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