Merge branch 'master_tolag3'

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<String, Object> 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<MenuManageJTreeVO> 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();
 		}

src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

@@ -73,7 +73,7 @@
 									</a>
 									
 									<div class="depth02_wrap">
-										<strong class="menu_title"><span>상표권조건부 기소유예</span></strong>
+										<strong class="menu_title"><span><c:out value="${resultListOne.menuNm}" escapeXml="false" /></span></strong>
 										<ul class="depth02">
 											<c:forEach var="resultListTwo" items="${menuResultList}" varStatus="status"> 
 												<c:if test="${resultListTwo.depths eq '2' && resultListOne.menuNo  eq resultListTwo.upperMenuId }">

src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp

@@ -126,7 +126,20 @@
 			<div class="container">
 				<div class="sub_visual">
 					<div class="visual_text">
-						<strong>상표권 교육조건부 기소유예</strong>
+						<strong>
+						<c:forEach var="resultListTit" items="${menuResultList}" varStatus="status">
+							<c:if test="${resultListTit.depths eq '2' and fn:contains(resultListTit.url, pageUri)}" >
+								<!-- 조건을 만족하는 항목에 대한 처리 -->
+								<c:set var="upperMenuId" value="${resultListTit.upperMenuId }"/>
+							</c:if>
+						</c:forEach>
+						<c:forEach var="resultListTit" items="${menuResultList}" varStatus="status">
+							<c:if test="${resultListTit.depths eq '1' and upperMenuId eq resultListTit.menuNo }" >
+									${resultListTit.menuNm }
+							</c:if>
+						</c:forEach>
+						<!-- 상표권 교육조건부 기소유예 -->
+						</strong>
 						<p>지식재산보호교육시스템</p>
 					</div>
 				</div>