업체추가 오류 수정

이민희

2021-12-10 39b3723acfbe0825ce13056ab5db6e5952674bc0

업체추가 오류 수정

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

@@ -124,11 +124,12 @@
        IspFieldVo ispFieldVo = new IspFieldVo();
        HostingFieldVo hostingFieldVo = new HostingFieldVo();

        IspField ispField = new IspField();
        HostingField hostingField = new HostingField();

        Long companyId = companyFieldCondition.getId();
        if (companyId != null) {
            CompanyField companyField = this.getCompany(companyId);
            IspField ispField = null;
            HostingField hostingField = null;
            if(companyField.getIspId() != null){
                ispField = this.ispFieldRepository.getOne(companyField.getIspId());
            }
@@ -210,17 +211,21 @@

        for (Map<String, Object> result : results) {
            CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(result, CompanyFieldVo.class);
            if(companyFieldVo.getIspId() != null){
            if(companyFieldVo.getIspId() != null && companyFieldVo.getIspId() != -1){
                //IspField ispField = this.ispFieldRepository.getOne(companyFieldVo.getIspId());
                IspField ispField = this.ispFieldService.getIsp(companyFieldVo.getIspId());
                IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
                companyFieldVo.setIspFieldVo(ispFieldVo);
                if(ispField != null){
                    IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
                    companyFieldVo.setIspFieldVo(ispFieldVo);
                }
            }
            if(companyFieldVo.getHostingId() != null){
            if(companyFieldVo.getHostingId() != null && companyFieldVo.getIspId() != -1){
                //HostingField hostingField = this.hostingFieldRepository.getOne(companyFieldVo.getHostingId());
                HostingField hostingField = this.hostingFieldService.getHosting(companyFieldVo.getHostingId());
                HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
                companyFieldVo.setHostingFieldVo(hostingFieldVo);
                if(hostingField != null){
                    HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
                    companyFieldVo.setHostingFieldVo(hostingFieldVo);
                }
            }
            companyFieldVos.add(companyFieldVo);
        }

 src/main/webapp/i18n/ko/global.json

@@ -925,6 +925,7 @@
    },
    "ispField" : {
        "info": "ISP정보",
        "select": "ISP 선택",
        "add" : "ISP생성",
        "name" : "ISP이름",
        "ispName" : "ISP명",
@@ -944,6 +945,7 @@
    },
    "hostingField" : {
        "info": "호스팅정보",
        "select": "호스팅 선택",
        "add" : "호스팅생성",
        "name" : "호스팅이름",
        "manager" : "호스팅이름",

 src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js

@@ -80,14 +80,14 @@
                        name : $rootScope.preventXss($scope.vm.form.name),    //  업체명
                        ispId : (function () {  // ISP 아이디
                            var ispId = -1;
                            if ($scope.vm.form.issueIspFields.length > 0) {
                            if ($scope.vm.form.issueIspFields != null) {
                                ispId = $scope.vm.form.ispId;
                            }
                            return ispId;
                        })(),
                        hostingId : (function () {  // Hosting 아이디
                            var hostingId = -1;
                            if ($scope.vm.form.issueHostingFields.length > 0) {
                            if ($scope.vm.form.issueHostingFields != null) {
                                hostingId = $scope.vm.form.hostingId;
                            }
                            return hostingId;

 src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js

@@ -149,8 +149,12 @@
                                $scope.vm.form.tel = result.data.content.tel;
                                $scope.vm.form.url = result.data.content.url;
                                $scope.vm.form.memo = result.data.content.memo;
                                $scope.vm.form.ispName = result.data.content.ispFieldVo.name;
                                $scope.vm.form.hostingName = result.data.content.hostingFieldVo.name;
                                if(result.data.content.ispFieldVo != null){
                                    $scope.vm.form.ispName = result.data.content.ispFieldVo.name;
                                }
                                if(result.data.content.hostingFieldVo != null){
                                    $scope.vm.form.hostingName = result.data.content.hostingFieldVo.name;
                                }
                            }
                        }
                        else {

 src/main/webapp/views/companyField/companyFieldAdd.html

@@ -32,7 +32,7 @@

            <div class="form-group">
                <label class="issue-label">
                    <span translate="ispField.name">ISP 이름</span>
                    <span translate="ispField.select">ISP 선택</span>
                </label>
                <js-autocomplete-single data-input-name="ispField"
                                    selected-model="vm.form.issueIspFields"
@@ -50,7 +50,7 @@

            <div class="form-group">
                <label class="issue-label">
                    <span translate="hostingField.name">호스팅 이름</span>
                    <span translate="hostingField.select">호스팅 선택</span>
                </label>
                <js-autocomplete-single data-input-name="hostingField"
                                    selected-model="vm.form.issueHostingFields"

 src/main/webapp/views/companyField/companyFieldModify.html

@@ -31,7 +31,7 @@
            </div>
            <div class="form-group">
                <label class="issue-label">
                    <span translate="ispField.name">ISP 이름</span>
                    <span translate="ispField.select">ISP 선택</span>
                </label>
                <js-autocomplete-single data-input-name="ispField"
                                        selected-model="vm.form.issueIspFields"
@@ -49,7 +49,7 @@

            <div class="form-group">
                <label class="issue-label">
                    <span translate="hostingField.name">호스팅 이름</span>
                    <span translate="hostingField.select">호스팅 선택</span>
                </label>
                <js-autocomplete-single data-input-name="hostingField"
                                        selected-model="vm.form.issueHostingFields"