From 2c6b2fcf3958b81f09edd7d2e5dee4547ae57faf Mon Sep 17 00:00:00 2001 From: thkim Date: Fri, 6 Feb 2026 16:34:18 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B1=B4=EC=84=A4=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=EC=8B=9C,=20=EB=B0=9C=EC=A3=BC=EA=B8=B0?= =?UTF-8?q?=EA=B4=80=20=EC=A0=95=EB=B3=B4=20=EC=9E=90=EB=8F=99=20=EC=99=84?= =?UTF-8?q?=EC=84=B1=EB=90=98=EB=8F=84=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/DrillingCommonController.java | 4 +- .../input/DrillingInputController.java | 2 +- .../impl/DrillingInputServiceImpl.java | 36 +++- .../inquiry/DrillingInquiryController.java | 2 +- .../impl/DrillingInquiryServiceImpl.java | 4 +- src/main/java/geoinfo/util/MyUtil.java | 2 +- .../drilling/input/DrillingInputMapper.xml | 3 +- .../views/drilling/common/includeTopMenu.jsp | 7 +- .../views/drilling/input/drilling_input.jsp | 190 +++++++++++------- .../drilling/inquiry/drilling_inquiry.jsp | 18 +- .../inquiry/drilling_inquiry_project.jsp | 4 +- .../WEB-INF/views/drilling/mgmt/project.jsp | 4 +- ...homeEducationApplicationInquiryHistory.jsp | 4 +- ...isitEducationApplicationInquiryProject.jsp | 4 +- 14 files changed, 183 insertions(+), 101 deletions(-) diff --git a/src/main/java/geoinfo/drilling/common/DrillingCommonController.java b/src/main/java/geoinfo/drilling/common/DrillingCommonController.java index 5471aebd..b013781f 100644 --- a/src/main/java/geoinfo/drilling/common/DrillingCommonController.java +++ b/src/main/java/geoinfo/drilling/common/DrillingCommonController.java @@ -43,10 +43,12 @@ public class DrillingCommonController { Map map = new HashMap(); - map.put("userid", String.valueOf(request.getSession().getAttribute("USERID"))); +// map.put("userid", String.valueOf(request.getSession().getAttribute("USERID"))); try { Map result = loginService.selectWebMemberIn(map); model.put("masterCompanyCode", result.get("master_company_code")); + model.put("partName", result.get("part_name")); + model.put("phone", result.get("phone")); } catch (Exception e) { model.put("errorMessage", "계정이 존재하지 않습니다"); return "/error"; diff --git a/src/main/java/geoinfo/drilling/input/DrillingInputController.java b/src/main/java/geoinfo/drilling/input/DrillingInputController.java index 9284c921..4cfc4b73 100644 --- a/src/main/java/geoinfo/drilling/input/DrillingInputController.java +++ b/src/main/java/geoinfo/drilling/input/DrillingInputController.java @@ -179,7 +179,7 @@ public class DrillingInputController { JSONObject jsonObject = new JSONObject(); strUtil sUtil = new strUtil(); - String projectName = sUtil.checkNull((String)params.get("companyName")); + String projectName = sUtil.checkNull((String)params.get("companyName")); JSONArray jsonListObject = new JSONArray(); diff --git a/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java b/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java index 913bc47b..732d5a63 100644 --- a/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java +++ b/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java @@ -60,7 +60,7 @@ public class DrillingInputServiceImpl implements DrillingInputService { String projectMasterCompanyName = loginMapper.findProjectMasterCompanyNameByUserid(userId); if( projectMasterCompanyName == null ) { - throw new Exception( "발주 기관 계정에 설정된 기관이 존재하지 않습니다" ); + throw new Exception( "발주 기관 계정에 설정된 기관이 존재하지 않습니다. 로그인이 해제된 것으로 추측됩니다." ); } HashMap spGetMasterCompanyDistrictParams = new HashMap(); @@ -143,13 +143,35 @@ public class DrillingInputServiceImpl implements DrillingInputService { @Override public List selectConstructCompanyList(HashMap params) throws Exception { - long start = System.currentTimeMillis(); - List list = new ArrayList(); - list = drillingInputMapper.selectConstructCompanyList(params); - long end = System.currentTimeMillis(); - LOGGER.info("( SERVICE ) selectConstructCompanyList 실행시간: {} ms", (end - start)); + List list = new ArrayList(); + String companyName = MyUtil.getStringFromObject(params.get("companyName")); + + if (companyName == null || companyName.isEmpty()) { + return list; + } - return list; + companyName = companyName.trim(); + + // 1. 자음/모음만 있는 불완전한 한글(ㄱ~ㅎ, ㅏ~ㅣ)이 포함되어 있는지 체크 + if (companyName.matches(".*[ㄱ-ㅎㅏ-ㅣ].*") && !companyName.matches(".*[가-힣].*")) { + return list; // 검색을 수행하지 않고 즉시 반환 + } + + // 2. 너무 흔한 단어 단독 검색 차단 + if (companyName.equals("(주)") || companyName.equals("주식회사")) { + return list; + } + + String escapedName = companyName.replaceAll("^\\(.*?\\)", ""); + escapedName = escapedName.replaceAll("\\(.*?\\)$", ""); + escapedName = escapedName.replaceAll("\\(.*?\\).*", ""); + + //String escapedName = companyName.replace("(", "\\(").replace(")", "\\)"); + + params.put("companyName", escapedName); + list = drillingInputMapper.selectConstructCompanyList(params); + + return list; } @Override diff --git a/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java b/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java index 67936343..2de1d977 100644 --- a/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java +++ b/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java @@ -397,7 +397,7 @@ public class DrillingInquiryController { sb.append(s(row.get("masterCompanyDept"))).append(","); sb.append(s(row.get("masterCompanyAdmin"))).append(","); sb.append(s(row.get("masterCompanyTel"))).append(","); - sb.append(s(row.get("coinstCompanyDept"))).append(","); + sb.append(s(row.get("constCompanyDept"))).append(","); sb.append(s(row.get("constCompanyAdmin"))).append(","); sb.append(s(row.get("constCompanyTel"))).append("\n"); } diff --git a/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java b/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java index daa7c781..ea81e18f 100644 --- a/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java +++ b/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java @@ -154,8 +154,8 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService { Long nConstCompanyCodeKey = MyUtil.getLongFromObject(data.get(constCompanyCodeKey)); if( nConstCompanyCodeKey != null ) { params.put(constCompanyCodeKey, nConstCompanyCodeKey); - String coinstCompanyDept = drillingInquiryMapper.spGetConstCompanyName(nConstCompanyCodeKey); - data.put("coinstCompanyDept", coinstCompanyDept); + String constCompanyDept = drillingInquiryMapper.spGetConstCompanyName(nConstCompanyCodeKey); + data.put("constCompanyDept", constCompanyDept); } diff --git a/src/main/java/geoinfo/util/MyUtil.java b/src/main/java/geoinfo/util/MyUtil.java index c3e2a258..edb29a2f 100644 --- a/src/main/java/geoinfo/util/MyUtil.java +++ b/src/main/java/geoinfo/util/MyUtil.java @@ -28,7 +28,7 @@ public final class MyUtil { private static final Logger logger = LoggerFactory.getLogger(MyUtil.class); - public static final String VERSION = "20240816_1430"; + public static final String VERSION = "20260206_1430"; private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss"); diff --git a/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml b/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml index f8ae25f6..c93c6030 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml @@ -75,7 +75,8 @@ TRIM(wmi.COMPANY_NAME) AS COMPANY_NAME, wmi.USERID, TRIM(wmi.PART_NAME) AS PART_NAME, - wmi.EMAIL + wmi.EMAIL, + wmi.USER_NAME FROM web_member_in wmi WHERE diff --git a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp b/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp index e6be6755..910343bc 100644 --- a/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/common/includeTopMenu.jsp @@ -21,7 +21,12 @@ " /> " /> " /> - + " /> + " /> + " /> + " /> + " /> +
diff --git a/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp b/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp index d2fca358..3d056e4f 100644 --- a/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp @@ -220,74 +220,78 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe function addItem() { tableId += 1; - var newTable = ` -
- - - - - - - - - - - - - - - - - - - - - - - - - - `; - if (tableId > 1) { - newTable += ` - - - `; - } - - newTable += ` -
사업명 - -
사업기간 - - ~ - - 사업단계 - -
발주기관 - - - -
건설사 - - - - - - -
-
- `; + + const gnbPartName = document.getElementById('gnb-part-name' ).value; + const gnbUserName = document.getElementById('gnb-user-name' ).value; + const gnbPhone = document.getElementById('gnb-phone' ).value; + + + + var newTable = '
' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' '; + + if (tableId > 1) { + newTable += '' + + ' ' + + ''; + } + + newTable += '
사업명' + + ' ' + + '
사업기간' + + ' ' + + ' ~' + + ' ' + + ' 사업단계' + + ' ' + + '
발주기관' + + ' ' + + ' ' + + ' ' + + '
건설사' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + '
'; document.getElementById('table-container').insertAdjacentHTML('beforeend', newTable); } @@ -417,12 +421,14 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe list.forEach(function (item) { const suggestionItem = document.createElement('div'); - let userid = ''; - let partName = ''; - let email = ''; - if (item.userid) userid = item.userid; - if (item.partName) partName = item.partName; - if (item.email) email = item.email; + let userid = ''; + let partName = ''; + let userName = ''; + let email = ''; + if (item.userid) userid = item.userid; + if (item.partName) partName = item.partName; + if (item.email) email = item.email; + if (item.userName) userName = item.userName; const keyword = companyName; const regex = new RegExp(keyword, 'gi'); @@ -434,6 +440,10 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe regex, '' + keyword + '' ); + const boldUserName = item.userName.replace( + regex, + '' + keyword + '' + ); const boldEmail = item.email.replace( regex, '' + keyword + '' @@ -441,14 +451,26 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe suggestionItem.innerHTML = '' + boldCompanyName + '
' + - '' + boldConstUserid + '(' + partName + ')' + '/' + boldEmail + '' + boldConstUserid + '(' + boldUserName + ')' + '/' + boldEmail ''; - suggestionItem.addEventListener('click', function () { + suggestionItem.addEventListener('click', function () { companyNameInput.value = item.companyName; hiddenUserIdInput.value = item.userid; suggestionListDiv.style.display = 'none'; setConstInfo(userid, tableContainerDiv); // 건설사 계정 선택시 이름, 연락처 자동 셋팅 + + + + // 툴팁에 표시할 아이디 가져오기 + const constUserid = item.userid == null ? '' : item.userid; + let toolTip = ''; + if( constUserid !== '' ) { + toolTip += '지정된 기업 사용자 아이디: ' + constUserid + '\n'; + } + companyNameInput.setAttribute('title', toolTip); + + }); suggestionListDiv.appendChild(suggestionItem); @@ -779,6 +801,22 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe orgConstName = item.constCompanyAdmin ? item.constCompanyAdmin : ""; orgConstTel = item.constCompanyTel ? item.constCompanyTel : ""; orgPrjCd = item.projectCode ? item.projectCode : ""; + + + + // 툴팁에 표시할 아이디 가져오기 + const constUserid = item.constUserid == null ? '' : item.constUserid; + const projectCode = item.projectCode == null ? '' : item.projectCode; + + let toolTip = ''; + if( constUserid !== '' ) { + toolTip += '지정된 기업 사용자 아이디: ' + constUserid + '\n'; + } + if( projectCode !== '' ) { + toolTip += '프로젝트 코드: ' + projectCode + '\n'; + } + + document.getElementById('const-company-dept-1').setAttribute('title', toolTip); } } else if (xhr.readyState === 4) {   // 요청 실패 시 처리 diff --git a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp index b2d33837..14cedda5 100644 --- a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp @@ -192,10 +192,24 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe const masterCompanyDept = obj.datas[idx].masterCompanyDept == null ? '-' : obj.datas[idx].masterCompanyDept; const masterCompanyAdmin = obj.datas[idx].masterCompanyAdmin == null ? '-' : obj.datas[idx].masterCompanyAdmin; const masterCompanyTel = obj.datas[idx].masterCompanyTel == null ? '-' : obj.datas[idx].masterCompanyTel; - const coinstCompanyDept = obj.datas[idx].coinstCompanyDept == null ? '-' : obj.datas[idx].coinstCompanyDept; + const constCompanyDept = obj.datas[idx].constCompanyDept == null ? '-' : obj.datas[idx].constCompanyDept; const constCompanyAdmin = obj.datas[idx].constCompanyAdmin == null ? '-' : obj.datas[idx].constCompanyAdmin; const constCompanyTel = obj.datas[idx].constCompanyTel == null ? '-' : obj.datas[idx].constCompanyTel; + // 툴팁에 표시할 아이디 가져오기 + const constUserid = obj.datas[idx].constUserid == null ? '' : obj.datas[idx].constUserid; + const projectCode = obj.datas[idx].projectCode == null ? '' : obj.datas[idx].projectCode; + + let toolTip = ''; + if( constUserid !== '' ) { + toolTip += '기업 사용자 아이디: ' + constUserid + '\n'; + } + if( constCompanyDept !== '' ) { + toolTip += '건설사명: ' + constCompanyDept + '\n'; + } + if( projectCode !== '' ) { + toolTip += '프로젝트 코드: ' + projectCode + '\n'; + } // content += ''; content += ''; content += '' + (obj.count - idx - (nCount * (nPage - 1))) + ''; @@ -206,7 +220,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe content += '' + masterCompanyDept + ''; content += '' + masterCompanyAdmin + ''; content += '' + masterCompanyTel + ''; - content += '' + coinstCompanyDept + ''; + content += '' + constCompanyDept + ''; content += '' + constCompanyAdmin + ''; content += '' + constCompanyTel + ''; content += ''; diff --git a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry_project.jsp b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry_project.jsp index 18373afe..cbdb6f93 100644 --- a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry_project.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry_project.jsp @@ -91,7 +91,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe const masterCompanyDept = obj.datas[idx].masterCompanyDept == null ? '-' : obj.datas[idx].masterCompanyDept; const masterCompanyAdmin = obj.datas[idx].masterCompanyAdmin == null ? '-' : obj.datas[idx].masterCompanyAdmin; const masterCompanyTel = obj.datas[idx].masterCompanyTel == null ? '-' : obj.datas[idx].masterCompanyTel; - const coinstCompanyDept = obj.datas[idx].coinstCompanyDept == null ? '-' : obj.datas[idx].coinstCompanyDept; + const constCompanyDept = obj.datas[idx].constCompanyDept == null ? '-' : obj.datas[idx].constCompanyDept; const constCompanyAdmin = obj.datas[idx].constCompanyAdmin == null ? '-' : obj.datas[idx].constCompanyAdmin; const constCompanyTel = obj.datas[idx].constCompanyTel == null ? '-' : obj.datas[idx].constCompanyTel; content += @@ -105,7 +105,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe ` + masterCompanyDept + ` ` + masterCompanyAdmin + ` ` + masterCompanyTel + ` - ` + coinstCompanyDept + ` + ` + constCompanyDept + ` ` + constCompanyAdmin + ` ` + constCompanyTel + ` diff --git a/src/main/webapp/WEB-INF/views/drilling/mgmt/project.jsp b/src/main/webapp/WEB-INF/views/drilling/mgmt/project.jsp index ace9406e..5f360a59 100644 --- a/src/main/webapp/WEB-INF/views/drilling/mgmt/project.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/mgmt/project.jsp @@ -103,7 +103,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe const masterCompanyDept = obj.datas[idx].masterCompanyDept == null ? '-' : obj.datas[idx].masterCompanyDept; const masterCompanyAdmin = obj.datas[idx].masterCompanyAdmin == null ? '-' : obj.datas[idx].masterCompanyAdmin; const masterCompanyTel = obj.datas[idx].masterCompanyTel == null ? '-' : obj.datas[idx].masterCompanyTel; - const coinstCompanyDept = obj.datas[idx].coinstCompanyDept == null ? '-' : obj.datas[idx].coinstCompanyDept; + const constCompanyDept = obj.datas[idx].constCompanyDept == null ? '-' : obj.datas[idx].constCompanyDept; const constCompanyAdmin = obj.datas[idx].constCompanyAdmin == null ? '-' : obj.datas[idx].constCompanyAdmin; const constCompanyTel = obj.datas[idx].constCompanyTel == null ? '-' : obj.datas[idx].constCompanyTel; content += @@ -117,7 +117,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe ` + masterCompanyDept + ` ` + masterCompanyAdmin + ` ` + masterCompanyTel + ` - ` + coinstCompanyDept + ` + ` + constCompanyDept + ` ` + constCompanyAdmin + ` ` + constCompanyTel + ` diff --git a/src/main/webapp/WEB-INF/views/homeEducationApplication/inquiry/homeEducationApplicationInquiryHistory.jsp b/src/main/webapp/WEB-INF/views/homeEducationApplication/inquiry/homeEducationApplicationInquiryHistory.jsp index 3bb35223..30d7db74 100644 --- a/src/main/webapp/WEB-INF/views/homeEducationApplication/inquiry/homeEducationApplicationInquiryHistory.jsp +++ b/src/main/webapp/WEB-INF/views/homeEducationApplication/inquiry/homeEducationApplicationInquiryHistory.jsp @@ -105,7 +105,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe const masterCompanyDept = obj.datas[idx].masterCompanyDept == null ? '-' : obj.datas[idx].masterCompanyDept; const masterCompanyAdmin = obj.datas[idx].masterCompanyAdmin == null ? '-' : obj.datas[idx].masterCompanyAdmin; const masterCompanyTel = obj.datas[idx].masterCompanyTel == null ? '-' : obj.datas[idx].masterCompanyTel; - const coinstCompanyDept = obj.datas[idx].coinstCompanyDept == null ? '-' : obj.datas[idx].coinstCompanyDept; + const constCompanyDept = obj.datas[idx].constCompanyDept == null ? '-' : obj.datas[idx].constCompanyDept; const constCompanyAdmin = obj.datas[idx].constCompanyAdmin == null ? '-' : obj.datas[idx].constCompanyAdmin; const constCompanyTel = obj.datas[idx].constCompanyTel == null ? '-' : obj.datas[idx].constCompanyTel; content += @@ -119,7 +119,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe ` + masterCompanyDept + ` ` + masterCompanyAdmin + ` ` + masterCompanyTel + ` - ` + coinstCompanyDept + ` + ` + constCompanyDept + ` ` + constCompanyAdmin + ` ` + constCompanyTel + ` diff --git a/src/main/webapp/WEB-INF/views/visitEducationApplication/inquiry/visitEducationApplicationInquiryProject.jsp b/src/main/webapp/WEB-INF/views/visitEducationApplication/inquiry/visitEducationApplicationInquiryProject.jsp index 2e3b1790..12e5a3dd 100644 --- a/src/main/webapp/WEB-INF/views/visitEducationApplication/inquiry/visitEducationApplicationInquiryProject.jsp +++ b/src/main/webapp/WEB-INF/views/visitEducationApplication/inquiry/visitEducationApplicationInquiryProject.jsp @@ -105,7 +105,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe const masterCompanyDept = obj.datas[idx].masterCompanyDept == null ? '-' : obj.datas[idx].masterCompanyDept; const masterCompanyAdmin = obj.datas[idx].masterCompanyAdmin == null ? '-' : obj.datas[idx].masterCompanyAdmin; const masterCompanyTel = obj.datas[idx].masterCompanyTel == null ? '-' : obj.datas[idx].masterCompanyTel; - const coinstCompanyDept = obj.datas[idx].coinstCompanyDept == null ? '-' : obj.datas[idx].coinstCompanyDept; + const constCompanyDept = obj.datas[idx].constCompanyDept == null ? '-' : obj.datas[idx].constCompanyDept; const constCompanyAdmin = obj.datas[idx].constCompanyAdmin == null ? '-' : obj.datas[idx].constCompanyAdmin; const constCompanyTel = obj.datas[idx].constCompanyTel == null ? '-' : obj.datas[idx].constCompanyTel; content += @@ -119,7 +119,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe ` + masterCompanyDept + ` ` + masterCompanyAdmin + ` ` + masterCompanyTel + ` - ` + coinstCompanyDept + ` + ` + constCompanyDept + ` ` + constCompanyAdmin + ` ` + constCompanyTel + `