diff --git a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/ClientMng_SQL.xml b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/ClientMng_SQL.xml
index 33ad0fe..07e4409 100644
--- a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/ClientMng_SQL.xml
+++ b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/ClientMng_SQL.xml
@@ -17,7 +17,11 @@
 			,TOTALROWS
 		FROM (
 			SELECT
-				ROW_NUMBER() OVER (ORDER BY A.DATETIME DESC, A.USER_NAME) AS NUM
+				ROW_NUMBER() OVER (
+		            ORDER BY
+		                CASE WHEN A.DATETIME IS NULL THEN 1 ELSE 0 END,
+		                A.DATETIME DESC,
+		                A.USERID) AS NUM
 				,A.USERID
 				,FN_MASK_NAME(A.USER_NAME) AS USER_NAME
 				,A.COMPANY_NAME AS COMPANY_NAME
@@ -85,7 +89,6 @@
 		</otherwise>
 	</choose>
 	<![CDATA[
-		ORDER BY DATETIMES DESC
 		) WHERE  NUM <= #{firstRecordIndex} + #{recordCountPerPage} AND NUM > #{firstRecordIndex}
 	]]>
 	</select>
diff --git a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml
index 3530adc..471f97c 100644
--- a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml
+++ b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml
@@ -17,7 +17,11 @@
 			,TOTALROWS
 		FROM (
 			SELECT
-				ROW_NUMBER() OVER (ORDER BY A.DATETIME DESC, A.USER_NAME) AS NUM
+				ROW_NUMBER() OVER (
+		            ORDER BY
+		                CASE WHEN A.DATETIME IS NULL THEN 1 ELSE 0 END,
+		                A.DATETIME DESC,
+		                A.USERID) AS NUM
 				,A.USERID
 				,FN_MASK_NAME(A.USER_NAME) AS USER_NAME
 				,A.COMPANY_NAME AS COMPANY_NAME
@@ -28,18 +32,18 @@
 				,TO_CHAR(LAST_VALUE(ROWNUM) OVER (ORDER BY ROWNUM ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)) AS TOTALROWS
 				,A.CLS
 			FROM WEB_MEMBER_IN A
-			WHERE CLS = #{cls}
+			WHERE A.CLS = #{cls}
 	]]>
 	<choose>
 		<when  test='searchTitle == "7"'>
 			<if test='searchBgndt != ""'>
 				<![CDATA[
-				AND DATETIME > TO_DATE(#{searchBgndt},'YYYY-MM-DD')
+				AND A.DATETIME > TO_DATE(#{searchBgndt},'YYYY-MM-DD')
 				]]>
 			</if>
 			<if test='searchEnddt != ""'>
 				<![CDATA[
-				AND DATETIME < TO_DATE(#{searchEnddt},'YYYY-MM-DD')
+				AND A.DATETIME < TO_DATE(#{searchEnddt},'YYYY-MM-DD')
 				]]>
 			</if>
 		</when>
@@ -84,8 +88,8 @@
 			</if>
 		</otherwise>
 	</choose>
+	
 	<![CDATA[
-		ORDER BY DATETIMES DESC
 		) WHERE  NUM <= #{firstRecordIndex} + #{recordCountPerPage} AND NUM > #{firstRecordIndex}
 	]]>
 	</select>
@@ -226,7 +230,11 @@
 			,TOTALROWS
 		FROM (
 			SELECT
-				ROW_NUMBER() OVER (ORDER BY A.DATETIME DESC, A.USER_NAME) AS NUM
+				ROW_NUMBER() OVER (
+		            ORDER BY
+		                CASE WHEN A.DATETIME IS NULL THEN 1 ELSE 0 END,
+		                A.DATETIME DESC,
+		                A.USERID) AS NUM
 				,A.USERID
 				,FN_MASK_NAME(A.USER_NAME) AS USER_NAME
 				,A.COMPANY_NAME AS COMPANY_NAME
@@ -275,7 +283,6 @@
 		</choose>
 	</if>
 	<![CDATA[
-		ORDER BY DATETIME DESC
 		)
 	]]>
 	</select>
@@ -295,7 +302,11 @@
 		,CLS
 	FROM (
 		SELECT
-			ROW_NUMBER() OVER (ORDER BY A.DATETIME DESC, A.USER_NAME) AS NUM
+			ROW_NUMBER() OVER (
+	            ORDER BY
+	                CASE WHEN A.DATETIME IS NULL THEN 1 ELSE 0 END,
+	                A.DATETIME DESC,
+	                A.USERID) AS NUM
 			,A.USERID
 			,FN_MASK_NAME(A.USER_NAME) AS USER_NAME
 			,(SELECT CODE_SD ||' '|| CODE_SGG FROM LIQ_MEMBER_GROUP WHERE A.GOVEMENT_CODE = CODE_HJD) AS LOCALGOVE
@@ -355,7 +366,6 @@
 		</otherwise>
 	</choose>
 	<![CDATA[
-		ORDER BY DATETIMES DESC, USER_NAME
 		) WHERE  NUM <= #{firstRecordIndex} + #{recordCountPerPage} AND NUM > #{firstRecordIndex}
 	]]>
 	</select>