tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tolag3'

Browse Source
This commit is contained in:
LJH 2022-09-05 17:44:02 +09:00
commit b416efbff6
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/com/cmm/util/IpUtil.java
View File

@ -97,7 +97,7 @@ public class IpUtil {
String ozServerNm = ""; String ozServerNm = "";
if(serverNm.contains("localhost") || serverNm.contains("219.240.88.15")) {//로컬 및 개발서버 요청시 서버 경로 처리 if(serverNm.contains("localhost") || serverNm.contains("219.240.88.15") || serverNm.contains("iten.co.kr")) {//로컬 및 개발서버 요청시 서버 경로 처리
ozServerNm = "http://219.240.88.15:8091"; ozServerNm = "http://219.240.88.15:8091";

4
src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java
View File

@ -22,9 +22,9 @@ public class OzSchdExportUtil {
//개발서버 및 운영서버 구분에 따른 서버 정보 셋팅 //개발서버 및 운영서버 구분에 따른 서버 정보 셋팅
String serverNm = request.getServerName(); String serverNm = request.getServerName();
if(serverNm.contains("localhost") || serverNm.contains("219.240.88.15")) { if(serverNm.contains("localhost") || serverNm.contains("219.240.88.15") || serverNm.contains("iten.co.kr")) {
ozApiUrl = "http://219.240.88.15:8091/oz80/server"; ozApiUrl = "http://192.168.0.125:8091/oz80/server";
ozApiIp = "192.168.0.125"; ozApiIp = "192.168.0.125";
}else { }else {

2
src/main/java/kcc/web/MainController.java
View File

@ -417,6 +417,8 @@ public class MainController {
popupzoneVo.setFirstIndex(0); popupzoneVo.setFirstIndex(0);
popupzoneVo.setSeCd("02"); //좌측팝업 popupzoneVo.setSeCd("02"); //좌측팝업
popupzoneVo.setUseYn("Y"); popupzoneVo.setUseYn("Y");
popupzoneVo.setSearchSortCnd("MB.sort");
popupzoneVo.setSearchSortOrd("ASC");
List<?> popupzoneList = egovPopupManageService.selectPopupzoneList(popupzoneVo); List<?> popupzoneList = egovPopupManageService.selectPopupzoneList(popupzoneVo);
model.addAttribute("popupzoneList", popupzoneList); model.addAttribute("popupzoneList", popupzoneList);

3
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp
View File

@ -369,7 +369,8 @@
<option value="<c:out value="${ass.agntSeq }|35|N"></c:out>">불출석</option> <option value="<c:out value="${ass.agntSeq }|35|N"></c:out>">불출석</option>
</select> </select>
</c:when> </c:when>
<c:when test="${ass.assUsrTy=='30' && ass.isAgnt eq 'N'}"> <%-- <c:when test="${ass.assUsrTy=='30' && ass.isAgnt eq 'N'}"> --%>
<c:when test="${ass.isAgnt eq 'N'}">
<button type="button" class="btnType01 btn_change" onclick="fncAddAgnt('${ass.addUsrId}')">참관대리인등록</button> <button type="button" class="btnType01 btn_change" onclick="fncAddAgnt('${ass.addUsrId}')">참관대리인등록</button>
</c:when> </c:when>
</c:choose> </c:choose>