# WARNING: head commit changed in the meantime

Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

src/main/java/seed/com/gtm/base/BaseController.java

@@ -286,6 +286,7 @@ public class BaseController {
 		}
 
 		log.warn(">>>>>>>>params2<<<<<<<<<"+params);
+		log.warn(">>>>>>>>params2<<<<<<<<<"+mav.getViewName());
 		if("ajax".equals(pageName)){
 			log.warn("===================[[ ajax! ]]=================");
 			mavjson.addAllObjects(params);

src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Oracle.xml

@@ -13,6 +13,9 @@
 	<!-- 컨텐츠 리스트  -->
 	<select id="cntManageDAO.selectCntList" parameterClass="cntManageVO" resultClass="cntManageVO">
 		/*	cntManageDAO.selectCntList	*/
+		SELECT *
+		FROM (
+
 				SELECT 	  A.CNT_ID AS cntId,
 				  A.CNTDT_ID AS cntDtId,
 			      A.CNT_NAME AS 	cntName,
@@ -23,6 +26,7 @@
 		          */
 		          CASE WHEN C.MENU_NM='root' THEN '' ELSE C.MENU_NM END AS menuNm,
 			      TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') 	registPnttm
+			      , ROW_NUMBER () OVER (ORDER BY 1 ,TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') DESC) num
 			 	FROM CNT_MANAGE A  LEFT JOIN LETTNEMPLYRINFO B
 			 		ON A.REGISTER_ID = B.ESNTL_ID
 			 	 	LEFT OUTER JOIN LETTNMENUINFO C
@@ -44,8 +48,14 @@
 				</isNotEmpty>
 				/*
 				LIMIT recordCountPerPage OFFSET firstIndex
+				
+				OFFSET firstIndex ROWS FETCH NEXT recordCountPerPage ROWS ONLY
 				*/
-		OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY
+		
+			)
+		WHERE num BETWEEN #firstIndex# + 1 AND #recordCountPerPage#
+		
+
 	</select>
 	
 	<!-- 컨텐츠 리스트 카운트 -->
@@ -95,6 +105,9 @@
 	<!-- 컨텐츠 상세정보   -->
 	<select id="cntManageDAO.selectCntDtDetail" parameterClass="cntManageVO" resultClass="cntManageVO">
 		/*	cntManageDAO.selectCntDtDetail	*/
+		SELECT *
+		FROM (
+		
 				SELECT 	  A.CNT_ID cntId,
 				  A.CNTDT_ID cntDtId,
 				  A.CNT_CN cntCn ,
@@ -105,8 +118,14 @@
 			 	ON A.REGISTER_ID = B.ESNTL_ID
 			 	WHERE 1=1
 			 	AND CNTDT_ID = #cntDtId#
-        /* AND A.USE_AT = 'Y' */
+		        /* AND A.USE_AT = 'Y' 
 				LIMIT 1
+				*/		
+		
+			)
+		WHERE 1 >= rownum
+		
+
 	</select>
 	
 	<!-- 수정시 이전 컨텐츠 정보 모두 사용안함'N' 으로  -->
@@ -171,6 +190,8 @@
 	<!-- 컨텐츠 상세정보   -->
 	<select id="cntManageDAO.selectContentVo" parameterClass="cntManageVO" resultClass="cntManageVO">
 		/*	cntManageDAO.selectContentVo	*/
+		SELECT *
+		FROM (
 			SELECT  CNTDT_ID cntDtId,
 			  CNT_ID cntId,
 			  CNT_NAME  cntName,
@@ -185,8 +206,9 @@
 			WHERE A.PROGRM_FILE_NM = #progrmFileNm#
 			AND C.PROGRM_FILE_NM = #progrmFileNm#
 			AND B.USE_AT = 'Y'		
+		)
+		WHERE 1 >= rownum
 
-        LIMIT 1
 	</select>
 	
 	<!-- 컨텐츠 상세정보   -->

src/main/webapp/WEB-INF/jsp/_extra/web/user/news/newsList.jsp

@@ -202,6 +202,8 @@
             <li><button type="button" class="tab" onclick="pblEvt.tab(this,'active','ul',$('.tab'),'1');">뉴스레터 해지</button></li>
           </ul>
 
+				<form name="regForm" id="regForm" action="" method="post">
+
           <div class="tab_contents active news_service">
             <p class="text_explain">조정원에서 정기적으로 발행하는 뉴스레터 등 다양한 정책 정보를 받기를 원하시는 고객님들은 아래와 같은 입력 사항을 입력하신 후 등록해주시면 정지적으로 뉴스레터가 발송합니다.</p>
             <div class="box gray_fill">
@@ -270,6 +272,10 @@
             </div>
           </div>
           
+				</form>          
+
+				<form name="regForm2" id="regForm2" action="" method="post">
+				
           <div class="tab_contents news_service">
             <p class="text_explain">조정원에서 정기적으로 발행하는 뉴스레터 해지를 원하시는 고객님께서는 정보를 입력해 주세요.</p>
             <div class="box gray_fill">
@@ -314,5 +320,6 @@
             </div>
           </div>
 
+				</form>
 
         </div>