diff --git a/Dao/MyBatis/Maps/User.xml b/Dao/MyBatis/Maps/User.xml
index 7cc198a..7de591f 100644
--- a/Dao/MyBatis/Maps/User.xml
+++ b/Dao/MyBatis/Maps/User.xml
@@ -715,19 +715,23 @@
         <update id="users.asno.save" parameterClass="hashtable">
             update users set asno=#asno# where userno=#userno#
         </update>
-        <select id="users.findme" parameterClass="hashtable" resultClass="users">
-            select a.userno,a.username
-            ,a.userid
-            ,CAST(AES_DECRYPT(UNHEX(a.mobile), <include refid="sql.digest"></include>) AS char) mobile
-            ,CAST(AES_DECRYPT(UNHEX(a.email), <include refid="sql.digest"></include>) AS char) email
-            from users a
-            where a.usertype in (1,11) and a.status=1
-            <isNotNull property="email">
-                and a.email=HEX(AES_ENCRYPT(#email#, <include refid="sql.digest"></include>))
-            </isNotNull>
+		<!-- 비밀번호 찾기 -->
+        <select id="users.findme" parameterClass="hashtable" resultClass="users">			
+            SELECT a.userno,a.username
+                ,a.userid
+                ,CAST(AES_DECRYPT(UNHEX(a.mobile), <include refid="sql.digest"></include>) AS char) mobile
+                ,CAST(AES_DECRYPT(UNHEX(a.email), <include refid="sql.digest"></include>) AS char) email
+			FROM users a
+			WHERE a.usertype IN (1,11)						
+			<!-- hs => 이메일과 핸드폰번호 찾기의 상황을 알 수 없어 STATUS를 타입별로 분리하고, EMAIL에만 9를 추가 -->
+			<isNotNull property="email">
+                AND a.email=HEX(AES_ENCRYPT(#email#, <include refid="sql.digest"></include>))
+				AND (a.STATUS = 1 OR a.STATUS = 9)
+			</isNotNull>
             <isNotNull property="mobile">
-                and a.mobile=HEX(AES_ENCRYPT(#mobile#, <include refid="sql.digest"></include>))
-            </isNotNull>
+                AND a.mobile=HEX(AES_ENCRYPT(#mobile#, <include refid="sql.digest"></include>))
+				AND a.STATUS = 1
+			</isNotNull>
         </select>
 
         <select id="users.findmes" parameterClass="hashtable" resultClass="users">