diff --git a/src/main/resources/sqlmapper/mappers/report/report.xml b/src/main/resources/sqlmapper/mappers/report/report.xml
index 4f6f56c..c1856f5 100644
--- a/src/main/resources/sqlmapper/mappers/report/report.xml
+++ b/src/main/resources/sqlmapper/mappers/report/report.xml
@@ -136,55 +136,44 @@
 	</select>
 
 	<select id="Report.selectSaveList" parameterType="reportSearchVO" resultMap="reportMap">
-        SELECT 	*
-        FROM 	(
-        			SELECT
-        				ROWNUM RNUM, RPT.*
-       				FROM
-       					RPT_INFO RPT
-       				WHERE
-       					IN_STATE_CODE = '99' AND
-       					IN_TYPE = #{type} AND
-		<choose>
-			<when test="type != null and type.equals(1)">
-						IN_USERID = #{userid}
-			</when>
-			<when test="type == null or type != 1">
-						IN_USERID IN (#{userid}, '''' || #{usegrade} || '''')
-			</when>
-		</choose>
-		<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''">
-					ORDER BY ${ordercol} ${orderasc}
-		</if>
-		<if test="orderCol == null or orderCol == '' or orderAsc == null or orderAsc == ''">
-					ORDER BY IN_SEQ DESC
-		</if>
-
-       			)
-	  	WHERE
-	  		RNUM &gt; #{firstindex} AND
-	  		RNUM &lt;= #{firstindex} + #{recordcountperPage}
-
-	</select>
+    SELECT (ROW_NUMBER() OVER()) AS RNUM,
+        rpt.*
+    FROM rpt_info rpt
+    where in_state_code = '99'
+        and in_type = #{type}
+        <choose>
+          <when test='type != null and type.equals("1")'>
+            and in_userid = #{userid}
+          </when>
+          <when test='type == null or type != "1"'>
+            and in_userid IN (#{userid}, '''' || #{usegrade} || '''')
+          </when>
+        </choose>
+        <choose>
+          <when test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''">
+            order by ${orderCol} ${orderAsc}
+          </when>
+          <otherwise>
+            order by in_seq desc
+          </otherwise>
+        </choose>
+    limit #{recordCountPerPage} offset #{firstIndex}
+  </select>
 
 	<select id="Report.selectSaveListCnt" parameterType="reportSearchVO" resultType="int">
 
-		SELECT
-			COUNT(*)
-		FROM
-			RPT_INFO
-		WHERE
-			IN_STATE_CODE = '99' AND
-       		IN_TYPE = #{type} AND
-
-	<choose>
-		<when test="type != null and type.equals(1)">
-			IN_USERID = #{userid}
-		 </when>
-		<when test="type == null or type != 1">
-			IN_USERID IN (#{userid}, '''' || #{usegrade} || '''')
-		 </when>
-	</choose>
+		SELECT COUNT(*)
+		FROM RPT_INFO
+		WHERE IN_STATE_CODE = '99'
+		  AND IN_TYPE = #{type}
+    <choose>
+      <when test='type != null and type.equals("1")'>
+        AND IN_USERID = #{userid}
+       </when>
+      <when test='type == null or type != "1"'>
+        AND IN_USERID IN (#{userid}, '''' || #{usegrade} || '''')
+       </when>
+    </choose>
 	</select>
 
 	<insert id="Report.insert" parameterType="reportVO">