Merge remote-tracking branch 'origin/master'

jhjang

2021-11-10 43a910170d8049ef99ba38cc2a81b99cad89fb0d

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

@@ -151,12 +151,6 @@
        return new ModelAndView(this.excelView);
    }

    // 삭제 할 업체가 있는지 확인
    @Override
    public boolean company(Long Id) {
        return this.companyFieldMapper.findByCompany(Id) > 0;
    }

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