diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 1dbc34e7..875959f3 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -968,7 +968,7 @@ public class MainController { /*최초 사이트 체크와 동시에 session 설정, 점검중 페이지 적용 */ @RequestMapping(value="/com/firstSiteCheck.do") public String firstSiteCheck(HttpServletRequest request, @RequestParam Map commandMap, - ModelMap model) + ModelMap model, MenuManageJTreeVO menuManageVO) throws Exception { try { SiteManagerVO siteManagerVO = new SiteManagerVO(); @@ -978,6 +978,31 @@ public class MainController { return "web/com/insp"; } model.addAttribute("siteManagerVO", siteManagerVO); + + + //로그인 권한 정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String auth = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getAuthority()); + //권한별 메뉴표시 + if(!auth.equals("ROLE_ADMIN") && auth != "") { + menuManageVO.setAuthorCode(auth); + }else if(auth.equals("ROLE_ADMIN")) { + menuManageVO.setAuthorCode("ROLE_ANONYMOUS"); + } + else { + menuManageVO.setAuthorCode("ROLE_ANONYMOUS"); + } + + MenuManageVO resultVO = new MenuManageVO(); + MenuManageVO tempMenuManageVO = new MenuManageVO(); + tempMenuManageVO.setSearchCondition("Y"); + setViewMenu(request , commandMap , tempMenuManageVO , resultVO , menuManageVO ); + List menuResultList = menuCreateManageService.selectMenuLeftListJtreeWeb(menuManageVO) ; + model.addAttribute("menuResultList", menuResultList); + String pageUrl = request.getRequestURI().replaceAll(request.getContextPath(), ""); + + String pageUri = pageUrl.substring(0, pageUrl.lastIndexOf("/")); + model.addAttribute("pageUri", pageUri); }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp index 4cb1951c..9622f003 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -858,24 +858,24 @@ - + 취소승인

${list.cnclCn}
- +
- + 취소반려

- ${list.aplctCn} + ${list.cnclCn}
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp index 6e18c718..bec36544 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -937,24 +937,24 @@
- + 취소승인

${list.cnclCn}
- +
- + 취소반려

- ${list.aplctCn} + ${list.cnclCn}
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp index f1911b2e..e403c254 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -858,24 +858,24 @@
- + 취소승인

${list.cnclCn}
- +
- + 취소반려

- ${list.aplctCn} + ${list.cnclCn}
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp index 08f821e8..60ce67ce 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp @@ -45,10 +45,10 @@ function footerSiteLinkPageGo (){
  • diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 6b5b689e..6ff3bbb6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -73,7 +73,7 @@
    - 상표권조건부 기소유예 +
      diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp index 744c91fd..32beb54f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp @@ -126,7 +126,20 @@
      - 상표권 교육조건부 기소유예 + + + + + + + + + + ${resultListTit.menuNm } + + + +

      지식재산보호교육시스템

      diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 95e18047..1cb4b2ac 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -94,7 +94,7 @@ function fn_egov_inqire_data(bbsId, nttId) { .layer_popup_wrap{position: fixed;z-index:999;left:50%;top:50%;transform:translate(-50%,-52%);} .layer_popup_wrap .popup_inner {position: relative;display: flex;width: 100%;height: 100%;vertical-align: middle;justify-content: center;align-items: center;gap:30px;} .pop-layer{min-width:300px;max-width:800px;max-height:800px; box-shadow: 0 0 5px rgba(0,0,0,0.3);} - .pop-layer img{width:100% !important;} + .pop-layer img{display:block;width:auto !important;} .pop-layer .pop-container {padding: 0px 0px;} .pop-layer p.ctxt {color: #666;line-height: 25px;} .pop-layer .btn-r {display: flex; width: 100%; padding-top: 10px;border-top: 1px solid #DDD;text-align: right; justify-content: space-between; padding:10px 15px; box-sizing: border-box; align-items: center;} @@ -102,6 +102,10 @@ function fn_egov_inqire_data(bbsId, nttId) { #tdCheck+label{overflow: hidden;border: 0;width: 1px;height: 1px;clip: rect(1px, 1px, 1px, 1px);clip-path: inset(50%);} .btn-layerClose{width: 16px; height: 16px; background-image: url(${pageContext.request.contextPath}/kccadrPb/usr/image/common/btn_close.png); background-repeat: no-repeat; background-size: 100%;} .today_close{font-size:1.6rem;} + + @media (max-width: 479px){ + .pop-layer img{width:100% !important;height:auto !important;;} + }