diff --git a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java index d30b3182..8ed82b28 100644 --- a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java +++ b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java @@ -412,7 +412,10 @@ public class EgovMenuCreateManageController { for(int i = 1 ; i < 100 ; i++){ //0~100까지 임의으 매뉴번호 생성후 이전 매뉴가 없는것을 조회 if(0==menuManageVO.getUpperMenuId()){ //루트매뉴가 0이면 9990000 insertMenNo = (9990000+"").replaceFirst("0" , i+"") ; - }else { + }else if(1==menuManageVO.getUpperMenuId()){ //루트매뉴가 0이면 9990000 + insertMenNo = (999000000+"").replaceFirst("0" , i+"") ; + } + else { insertMenNo = (menuManageVO.getUpperMenuId()+"").replaceFirst("0" , i+"") ; } @@ -449,6 +452,12 @@ public class EgovMenuCreateManageController { menuManageVO.setSiteId(user.getSiteId()); }*/ + if(menuManageVO.getRootMenuId().equals("0")) { + menuManageVO.setMenuUserType("A"); + }else if(menuManageVO.getRootMenuId().equals("1")) { + menuManageVO.setMenuUserType("U"); + } + menuManageService.insertMenuManage(menuManageVO); //메뉴생성내역 테이블에 등록 menuCreateManageService.insertMenuCreat(menuManageVO); @@ -500,10 +509,10 @@ public class EgovMenuCreateManageController { } - int usingOtherSiteCnt = menuCreateManageDAO.selectMenuCreatAuthCnt(menuCreatVO) ; //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다. - if(usingOtherSiteCnt == 1){ +// int usingOtherSiteCnt = menuCreateManageDAO.selectMenuCreatAuthCnt(menuCreatVO) ; //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다. +// if(usingOtherSiteCnt == 1){ menuManageService.deleteMenuManage(menuManageVO); - } +// } /*LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); if(null == loginVO){ @@ -514,9 +523,9 @@ public class EgovMenuCreateManageController { menuCreateManageDAO.deleteMenuCreatAuthNo(menuCreatVO); if(null != progrmManageVO.getProgrmFileNm() && !progrmManageVO.getProgrmFileNm().equals("dir")){ //프로그램만 지움 - if(usingOtherSiteCnt == 1){ //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다. +// if(usingOtherSiteCnt == 1){ //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다. progrmManageService.deleteProgrm(progrmManageVO); - } +// } } modelAndView.addObject("status", "success"); }catch (Exception e) { @@ -546,10 +555,13 @@ public class EgovMenuCreateManageController { modelAndView.setViewName("jsonView"); int cnt = 0; + menuManageVO.setSearchKeyword(String.valueOf(menuManageVO.getMenuNo())); + MenuManageVO tmpMenuManageVO = menuManageService.selectMenuManage(menuManageVO); //하위노드가 있는 메뉴의 경우 타입을 변경 하지 못하도록 수정 if( menuCreatVO.getExistChildNode().equals("Y") - && "M".equals(menuManageVO.getMenuType())) { + && !tmpMenuManageVO.getMenuType().equals(menuManageVO.getMenuType()) + && "M".equals(tmpMenuManageVO.getMenuType())) { modelAndView.addObject("status", "menuInNode"); return modelAndView; } diff --git a/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageVO.java b/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageVO.java index 7df8180a..90307c1c 100644 --- a/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageVO.java +++ b/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageVO.java @@ -118,6 +118,8 @@ public class MenuManageVO extends ComDefaultVO{ private List authorChkList; + private String rootMenuId; + /** * menuNo attribute를 리턴한다. * @return int @@ -538,6 +540,13 @@ public class MenuManageVO extends ComDefaultVO{ public void setAuthorChkList(List authorChkList) { this.authorChkList = authorChkList; } + public String getRootMenuId() { + return rootMenuId; + } + public void setRootMenuId(String rootMenuId) { + this.rootMenuId = rootMenuId; + } + diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 322fe845..00996074 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -190,183 +190,9 @@ public class MainController { @Value("#{globalSettings['Globals.email.toEmail.BCC']}") private String Globals_email_toEmail_BCC; - /** SSO return URL */ - @Value("#{globalSettings['Globals.sso.returnSiteUrl']}") - private String returnSiteUrlGlobal; - @Value("#{globalSettings['Globals.sso.returnSiteCode']}") - private String returnSiteCodeGlobal; - - /** SSO 회원관련 URL */ - @Value("#{globalSettings['Globals.sso.joinUrl']}") - private String joinUrl_Global; - @Value("#{globalSettings['Globals.sso.modifyUrl']}") - private String modifyUrl_Global; - @Value("#{globalSettings['Globals.sso.idFindUrl']}") - private String idFindUrl_Global; - @Value("#{globalSettings['Globals.sso.pwFindUrl']}") - private String pwFindUrl_Global; - - @Resource(name = "CmmnDetailCodeManageService") private EgovCcmCmmnDetailCodeManageService cmmnDetailCodeManageService; - @RequestMapping(value = "/{siteId}/web/main/mainPage_keri.do") - public String siteMainPage_keri(@PathVariable("siteId") String siteId , HttpServletRequest request, ModelMap model) throws Exception{ - //메인이미지 - /** EgovPropertyService.sample */ - MainzoneVO mainzoneVO = new MainzoneVO(); - mainzoneVO.setPageUnit(propertiesService.getInt("pageUnit")); - mainzoneVO.setPageSize(propertiesService.getInt("pageSize")); - - /** pageing */ - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(mainzoneVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(mainzoneVO.getPageUnit()); - paginationInfo.setPageSize(mainzoneVO.getPageSize()); - - mainzoneVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - mainzoneVO.setLastIndex(paginationInfo.getLastRecordIndex()); - mainzoneVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - mainzoneVO.setSiteId(siteId); - - List mainzoneList = egovPopupManageService.selectMainzoneList(mainzoneVO); //상단메인 이미지 - model.addAttribute("mainzoneList", mainzoneList); - BoardVO boardVO = new BoardVO(); - boardVO.setPageUnit(7); - boardVO.setPageSize(10); - paginationInfo.setCurrentPageNo(boardVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(boardVO.getPageUnit()); - paginationInfo.setPageSize(boardVO.getPageSize()); - - boardVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - boardVO.setLastIndex(paginationInfo.getLastRecordIndex()); - boardVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - boardVO.setBbsId("BBSMSTR_000000000153"); //라이브폴라스토리 - boardVO.setSecretAt("N"); //비밀글제외 - boardVO.setAtchFileCnt(1); //파일이 있는경우만(임의의 숫자 1) - - //대표이미지 가져오기 - ComDefaultCodeVO vo = new ComDefaultCodeVO(); - vo.setCodeId("ITN005"); - List cmmCaLevel = cmmUseService.selectCmmCodeDetail(vo); - BoardVO mainPolaVo = new BoardVO(); - if(cmmCaLevel != null){ - String bbsId = ((CmmnDetailCode)cmmCaLevel.get(0)).getCodeNm() ; - boardVO.setNttId(Integer.parseInt(bbsId)); - boardVO.setMainPolaNttId(bbsId); - mainPolaVo = bbsMngService.selectBoardArticle(boardVO); - if(mainPolaVo !=null){ - boardVO.setRecordCountPerPage(5); - model.addAttribute("livePolaStoryListOne", mainPolaVo); //첫번째 사진 - } - } - - Map livePolaStoryList = bbsMngService.selectBoardArticles(boardVO, "BBSA02"); - List livePolaArrayList = (List) livePolaStoryList.get("resultList") ; - model.addAttribute("livePolaStoryListOther", livePolaArrayList); //나머지 사진 - /*if(livePolaArrayList.size()!=0){ - - livePolaArrayList.remove(0) ; - - model.addAttribute("livePolaStoryList", livePolaStoryList.get("resultList")); - }*/ - - boardVO.setBbsId("BBSMSTR_000000000018"); // 공지사항 메인 컨텐츠 - Map map = bbsMngService.selectBoardArticles(boardVO, "BBSA02"); - model.addAttribute("notiList", map.get("resultList")); - /*boardVO.setBbsId("BBSMSTR_000000000101"); //입찰공고 - Map map1 = bbsMngService.selectBoardArticles(boardVO, "BBSA02"); - model.addAttribute("biddingList", map1.get("resultList"));*/ - // 공지사항 메인컨텐츠 조회 끝 ----------------------------------- - - // 자유게시판 메인 컨텐츠 조회 시작 --------------------------------- - boardVO.setPageUnit(9); - boardVO.setPageSize(10); - boardVO.setBbsId("BBSMSTR_BBBBBBBBBBBB"); - - paginationInfo.setCurrentPageNo(boardVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(boardVO.getPageUnit()); - paginationInfo.setPageSize(boardVO.getPageSize()); - - boardVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - boardVO.setLastIndex(paginationInfo.getLastRecordIndex()); - boardVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - model.addAttribute("bbsList", bbsMngService.selectBoardArticles(boardVO, "BBSA02").get("resultList")); - - // 설문참여 메인 컨텐츠 조회 시작 ----------------------------------- - ComDefaultVO qVO = new ComDefaultVO(); - qVO.setPageUnit(1); - qVO.setPageSize(10); - - /** pageing */ - paginationInfo.setCurrentPageNo(qVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(qVO.getPageUnit()); - paginationInfo.setPageSize(qVO.getPageSize()); - - qVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - qVO.setLastIndex(paginationInfo.getLastRecordIndex()); - qVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - //배너 리스트 조회 - BannerVO bannerVO = new BannerVO(); - bannerVO.setRecordCountPerPage(50); //50개까지 - bannerVO.setFirstIndex(0); - bannerVO.setReflctAt("Y"); //반영이 Y 만 - - ArrayList bannerVOList= (ArrayList) egovBannerService.selectBannerList(bannerVO) ;//배너6개 안되면 좌측 버튼이 안보임 - if(null != bannerVOList){ - for(int i=0; i<4; i++){ - if(bannerVOList.size()<6){ - bannerVOList.addAll(bannerVOList); - } - } - } - //bannerVO.setBannerList(egovBannerService.selectBannerList(bannerVO)); - bannerVO.setBannerList(bannerVOList); - model.addAttribute("bannerList", bannerVO.getBannerList()); - - //팝업리스트 조회 - /*if(!isMobile(request)){ //PC인경우만 - PopupManageVO popupManageVO = new PopupManageVO(); - popupManageVO.setRecordCountPerPage(10); //10개만 - popupManageVO.setNtceAt("Y"); //사용만 - popupManageVO.setMainPageFlag("Y") ; //메인화면의 용도(시작일 종료일 사이 조회) - List popupList = egovPopupManageService.selectPopupMainList(popupManageVO); - model.addAttribute("popupList", popupList); - }*/ - //알림판 - /** 알림창괸리 */ - PopupzoneVO popupzoneVo = new PopupzoneVO(); - List popupzoneList = egovPopupManageService.selectPopupzoneList(popupzoneVo); - model.addAttribute("popupzoneList", popupzoneList); - - /** 팝업존관리 */ - /* popupManageVO.setRecordCountPerPage(10); //10개만 - popupManageVO.setNtceAt("Y"); //사용만 - popupManageVO.setMainPageFlag("Y") ; //메인화면의 용도(시작일 종료일 사이 조회) - popupManageVO.setPopupType("Z"); //팝업존만 조회 - List popupzoneList = egovPopupManageService.selectPopupMainList(popupManageVO); - model.addAttribute("popupzoneList", popupzoneList);*/ - - - /** 사이버경고관리 */ - CyberAlertManageVO cyberManageVO = new CyberAlertManageVO(); - cyberManageVO.setCaId("CYBER_0000000001"); - List cyberAlerMap = cyberAlertManageService.selectCyberAlert(cyberManageVO); - EgovMap emp = new EgovMap(); - if( cyberAlerMap.size() != 0 ){ - emp = (EgovMap)cyberAlerMap.get(0); - } - model.addAttribute("cyberAlerMap", emp); - - - model.addAttribute("siteId", siteId); - String siteFolder = "site/"+siteId ; - return "web/"+siteFolder+"/main/mainPage"; - } - @RequestMapping(value = "/web/main/mainPage.do") public String siteMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception{ //메인이미지 @@ -429,13 +255,13 @@ public class MainController { //} /** 게시판 조회 - 조정사례 */ - BoardVO boardVO = new BoardVO(); - boardVO.setRecordCountPerPage(5); //게시글 수 - boardVO.setFirstIndex(0); // - boardVO.setBbsId("BBSMSTR_000000000651"); - List vo = bbsMngService.selectMainBoardRecent(boardVO); +// BoardVO boardVO = new BoardVO(); +// boardVO.setRecordCountPerPage(5); //게시글 수 +// boardVO.setFirstIndex(0); // +// boardVO.setBbsId("BBSMSTR_000000000651"); +// List vo = bbsMngService.selectMainBoardRecent(boardVO); - model.addAttribute("bbsList", vo); +// model.addAttribute("bbsList", vo); return "web/main/mainPage"; } @@ -478,126 +304,20 @@ public class MainController { model.addAttribute("ssoLoginVO", ssoLoginVO); } - String returnSiteUrl = returnSiteUrlGlobal; - String returnSiteCode = returnSiteCodeGlobal; +// String returnSiteUrl = returnSiteUrlGlobal; +// String returnSiteCode = returnSiteCodeGlobal; +// +// String joinUrl = joinUrl_Global; +// String modifyUrl = modifyUrl_Global; - String joinUrl = joinUrl_Global; - String modifyUrl = modifyUrl_Global; - - model.addAttribute("returnSiteUrl", (URLEncoder.encode(returnSiteUrl))); - model.addAttribute("returnSiteCode", returnSiteCode); - model.addAttribute("joinUrl", joinUrl); - model.addAttribute("modifyUrl", modifyUrl); +// model.addAttribute("returnSiteUrl", (URLEncoder.encode(returnSiteUrl))); +// model.addAttribute("returnSiteCode", returnSiteCode); +// model.addAttribute("joinUrl", joinUrl); +// model.addAttribute("modifyUrl", modifyUrl); return "web/com/webCommonHeader"; } - - /** - * 사용자 상단 매뉴 - */ - @RequestMapping(value="/{siteId}/web/com/webThemeCommonHeader.do") - public String webThemeCommonHeader(@PathVariable("siteId") String siteId , - @RequestParam Map commandMap, @ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO, - ModelMap model, HttpServletRequest request) - throws Exception { - - menuManageVO.setAuthorCode("ROLE_ANONYMOUS"); - menuManageVO.setMenuUserType(menuManageVO.getMenuUserType()); - //List menuResultList = menuCreateManageService.selectMenuListJtree(menuManageVO) ; - menuManageVO.setSiteId(siteId); - List menuResultList = menuCreateManageService.selectMenuListJtreeWeb(menuManageVO) ; - - List menuTwoExist = new ArrayList<>(); //2뎁스의 하위 매뉴가 있는것 조회 - HashSet underMenuEmpty = new HashSet(); //2뎁스의 하위매뉴 없는것 조회 - for(MenuManageJTreeVO menuManage : menuResultList){ - if(menuManage.getDepths().equals("3")){ - menuTwoExist.add(menuManage.getUpperMenuId()) ; - } - - if(menuManage.getDepths().equals("2")){ - underMenuEmpty.add(menuManage.getMenuNo()); - } - } - - HashSet underMenuExist = new HashSet(menuTwoExist); //하위매뉴가 있는것 - underMenuEmpty.removeAll(underMenuExist); //하위매뉴가 없는것 - - MenuManageJTreeVO menuManageTopVO = new MenuManageJTreeVO(); - menuManageTopVO.setUpperMenuId("#"); - menuManageTopVO.setMenuNo("0"); - - model.addAttribute("menuResultList", menuResultList); - model.addAttribute("underMenuExist", underMenuExist); - model.addAttribute("underMenuEmpty", underMenuEmpty); - model.addAttribute("siteId", siteId); - String siteFolder = "site/"+siteId ; - - - if("linc".equals(siteId)){ //linc 사업단 - //json 형태 만들기 - JSONObject jsonObject = new JSONObject(); - - JSONObject oneDepth = null; - JSONArray oneArray = new JSONArray(); - JSONObject twoDepth = null; - JSONArray twoArray = null; - JSONObject threeDepth = new JSONObject(); - JSONArray threeArray = new JSONArray(); - int onePoint = 1; - int twoPoint = 1; - for(MenuManageJTreeVO menuManageOne : menuResultList){ - if(menuManageOne.getDepths().equals("1")){ - oneDepth = new JSONObject(); - twoArray = new JSONArray(); - oneDepth.put("children", "1-1"); - oneDepth.put("name", menuManageOne.getMenuNm()); - for(MenuManageJTreeVO menuManageTwo : menuResultList){ - if(menuManageTwo.getDepths().equals("2")){ - if(menuManageOne.getMenuNo().equals(menuManageTwo.getUpperMenuId())){ - twoDepth = new JSONObject(); - twoDepth.put("children", ""+onePoint+"-"+twoPoint); - twoPoint = twoPoint+1; - twoDepth.put("name", menuManageTwo.getMenuNm()); - twoDepth.put("link", menuManageTwo.getUrl()); - twoArray.add(twoDepth) ; - } - } - } - oneArray.add(oneDepth) ; - oneDepth.put("children", twoArray); - onePoint = onePoint+1; - twoPoint =1; - } - } - - jsonObject.put("children", oneArray); - model.addAttribute("menuJson", jsonObject); - } - - if(siteId.equals("linc") || siteId.equals("klc")){ - return "web/"+siteFolder+"/com/webCommonHeader"; - }else{ - SiteManagerVO siteManagerVO = new SiteManagerVO(); - siteManagerVO.setSiteId(siteId); - - setSiteinfo(siteManagerVO, model , request ); - //return "web/site/theme_"+siteManagerVO.getTheme()+"/"+siteManagerVO.getIsMobile()+"/com/webCommonHeader"; - return "web/site/"+siteId+"/"+siteManagerVO.getIsMobile()+"/com/webCommonHeader"; - } - } - - - @RequestMapping(value="/web/com/webCommonHeader_back.do") - public String webCommonHeader_back( - @RequestParam Map commandMap, - ModelMap model) - throws Exception { - - return "web/com/webCommonHeader"; - } - - /** * 사용자 footer */ @@ -654,7 +374,12 @@ public class MainController { loginLog.setErrorCode(""); loginLog.setUserAt("U"); - if(!"anonymousUser".equals(EgovUserDetailsHelper.getAuthenticatedUser() )) { + Object obj = EgovUserDetailsHelper.getAuthenticatedUser(); + + if( + obj != null && + !"anonymousUser".equals(obj) + ) { LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); loginLog.setLoginId(loginVO.getId()); }else { @@ -674,7 +399,7 @@ public class MainController { } //loginLogService.logInsertLoginLog(loginLog); - loginLogService.logInsertLoginLogNewStep1(loginLog); +// loginLogService.logInsertLoginLogNewStep1(loginLog); // } //오늘 접속 / 최종접속 @@ -834,7 +559,7 @@ public class MainController { //권한별 메뉴표시 if(!userAuthority.equals("ROLE_ADMIN") - && !userAuthority.equals("ROLE_ADR_ADMIN") + /* && !userAuthority.equals("ROLE_ADR_ADMIN") */ && userAuthority != "") { menuManageVO.setAuthorCode(userAuthority); }else if(userAuthority.equals("ROLE_ADMIN") || userAuthority.equals("ROLE_ADR_ADMIN")) { @@ -882,20 +607,20 @@ public class MainController { Collections.reverse(menuCurrentResultList); //타이틀 역순을 위해 model.addAttribute("menuCurrentResultList", menuCurrentResultList); - SiteManagerVO siteManagerVO = new SiteManagerVO(); +// SiteManagerVO siteManagerVO = new SiteManagerVO(); //점검중 페이지 체크 - siteManagerVO = egovSiteManagerService.selectSiteManagerVO(siteManagerVO); - if("Y".equals(siteManagerVO.getInspFlag() )){ //점검중 - return "web/com/insp"; - } +// siteManagerVO = egovSiteManagerService.selectSiteManagerVO(siteManagerVO); +// if("Y".equals(siteManagerVO.getInspFlag() )){ //점검중 +// return "web/com/insp"; +// } //SSO 토큰 유효시간 timeout 시 메인페이지로 이동 - if(!"".equals(request.getSession().getAttribute("SsoLogout"))) { - if(request.getSession().getAttribute("SsoLogout") != null) { - request.removeAttribute("SsoLogout"); - return "redirect:/"; - } - } - model.addAttribute("siteManagerVO", siteManagerVO); +// if(!"".equals(request.getSession().getAttribute("SsoLogout"))) { +// if(request.getSession().getAttribute("SsoLogout") != null) { +// request.removeAttribute("SsoLogout"); +// return "redirect:/"; +// } +// } +// model.addAttribute("siteManagerVO", siteManagerVO); return "web/com/webLayout"; } diff --git a/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uss-ion-pwm.xml b/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uss-ion-pwm.xml new file mode 100644 index 00000000..cae2d419 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-uss-ion-pwm.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml index ba4e9d4b..d21fb609 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml @@ -250,197 +250,192 @@ diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMainMenu_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMainMenu_SQL_Oracle.xml index c7ff2c0a..b0969dff 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMainMenu_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMainMenu_SQL_Oracle.xml @@ -127,8 +127,8 @@ /* PopupzoneManage.selectPopupzoneList */ - TO_CHAR(REGDT, 'YYYY-MM-DD') REGDT, POPUPZONE_IMAGE, POPUPZONE_IMAGE_FILE, POZ_NM, USE_YN, SORT, - TO_CHAR(REGDT, 'YYYYMMDDHH24MI') REGDT, - (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = REGISTER_ID) REGISTER_ID, + + (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = REGISTER_ID) REGISTER_NM, SITE_ID FROM POPUPZONE MB WHERE DEL = '0' - ]]> AND ( POZ_NM LIKE '%' || #searchKeyword# || '%' @@ -337,7 +339,12 @@ $searchSortOrd$ - OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; + + ) PG + WHERE + ) #firstIndex# ]]> + + @@ -539,6 +546,9 @@