Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

wyu

2021-12-09 4c88eb1da24c07d53e244065241ce0549c99cbd4

Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

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

@@ -194,15 +194,15 @@
            String url = companyFieldVo.getUrl();

            IspField ispField = this.ispFieldRepository.findByUrl(url);
            IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
            if(ispFieldVo != null){
            if(ispField != null){
                IspFieldVo ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
                ispFieldVos.add(ispFieldVo);
            }
            companyFieldVo.setIspFieldVos(ispFieldVos);

            HostingField hostingField = this.hostingFieldRepository.findByUrl(url);
            HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
            if(hostingFieldVo != null){
            if(hostingField != null){
                HostingFieldVo hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
                hostingFieldVos.add(hostingFieldVo);
            }
            companyFieldVo.setHostingFieldVos(hostingFieldVos);

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

@@ -58,8 +58,10 @@
    // Hosting 추가
    @Override
    public HostingField add(HostingFieldForm HostingFieldForm) {
        //  url 유효성 체크
        this.verifyUrl(HostingFieldForm.getUrl(), null);
        if(HostingFieldForm.getUrl() != null){
            //  url 유효성 체크
            this.verifyUrl(HostingFieldForm.getUrl(), null);
        }

        HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class);
        hostingFieldRepository.saveAndFlush(HostingField);
@@ -68,10 +70,6 @@

    //  url 유효성 체크
    private void verifyUrl(String url, Long id) {
        if (StringUtils.isEmpty(url)) {
            throw new OwlRuntimeException(
                    this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_URL));
        }
        HostingField hostingField;

        if(id == null){
@@ -117,7 +115,9 @@
    @Override
    public void modify(HostingFieldForm HostingFieldForm) {
        //  url 유효성 체크
        this.verifyUrl(HostingFieldForm.getUrl(), HostingFieldForm.getId());
        if(HostingFieldForm.getUrl() != null){
            this.verifyUrl(HostingFieldForm.getUrl(), HostingFieldForm.getId());
        }

        HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class);
        hostingFieldRepository.saveAndFlush(HostingField);

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

@@ -59,7 +59,9 @@
    @Override
    public IspField add(IspFieldForm IspFieldForm) {
        //  url 유효성 체크
        this.verifyUrl(IspFieldForm.getUrl(), null);
        if(IspFieldForm.getUrl() != null){
            this.verifyUrl(IspFieldForm.getUrl(), null);
        }

        IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
        ispFieldRepository.saveAndFlush(IspField);
@@ -81,10 +83,6 @@

    //  url 유효성 체크
    private void verifyUrl(String url, Long id) {
        if (StringUtils.isEmpty(url)) {
            throw new OwlRuntimeException(
                    this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_URL));
        }
        IspField ispField;

        if(id == null){
@@ -116,8 +114,10 @@
    // Isp 정로를 수정한다.
    @Override
    public void modify(IspFieldForm IspFieldForm) {
        //  url 유효성 체크
        this.verifyUrl(IspFieldForm.getUrl(), IspFieldForm.getId());
        if(IspFieldForm.getUrl() != null){
            //  url 유효성 체크
            this.verifyUrl(IspFieldForm.getUrl(), IspFieldForm.getId());
        }

        IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
        ispFieldRepository.saveAndFlush(IspField);

 src/main/webapp/views/issue/issueListNormal.html

@@ -333,10 +333,11 @@
                                <form class="form-inline justify-content-sm-end  pull-right" method="post" action="/issue/downloadExcel" name="issueListForm" >
                                    <!--span class="badge-tip" function-tool-tip  data-placement="top" data-toggle="tooltip" data-original-title="엑셀 다운로드, 일괄 변경 등 다양한 기능을 제공합니다.">?</span-->
                                    <input type="hidden" name="conditions">
                                    <div class="btn-group">
                                        <input type="checkbox" ng-model="vm.hideIssue"> 완료 이슈 숨기기
                                        <button type="button" ng-click="fn.getPageList(0)">새로고침</button>
                                    <div>
                                        완료 이슈 숨기기
                                        <label class='switch'><input type='checkbox' ng-model='vm.hideIssue' ng-click='fn.getPageList(0)'><span class='slider round'></span></label>
                                    </div>
                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    <div class="btn-group">
                                        <button aria-expanded="false" aria-haspopup="true"
                                                tabindex="-1"