From 8419f76386edd4918b6e6d59888cf227c6c78bbe Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Fri, 7 Mar 2025 11:13:21 +0900
Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?=
 =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EB=B0=8F=20=EB=A1=9C=EA=B7=B8=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/NetprojctMapper.xml | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/mapper/NetprojctMapper.xml b/src/main/resources/mapper/NetprojctMapper.xml
index d9d8a05..2edfbc4 100644
--- a/src/main/resources/mapper/NetprojctMapper.xml
+++ b/src/main/resources/mapper/NetprojctMapper.xml
@@ -30,7 +30,7 @@
 	    <if test="category != null and category != ''">
 	        AND SUBSTRING(p.PROJCTSTR, 1, 4) = #{category}
 	    </if>
-	    ORDER BY p.PROJCTSEQ DESC
+	    ORDER BY p.PROJCTSTR DESC
 	</select>
 
 
@@ -79,25 +79,30 @@
     </update>
 
     <!-- 프로젝트 로그 조회 -->
-    <select id="selectProjectLog" parameterType="int" resultType="map">
-       	SELECT logDate, logMessage
-		FROM (
-		    SELECT 
-		        DATE_FORMAT(PROJCTCDT, '%Y-%m-%d %H:%i') AS logDate,
-		        CONCAT('[', PROJCTCMB, '] 프로젝트 등록') AS logMessage
-		    FROM netprojct
-		    WHERE PROJCTSEQ = #{projctSeq}
-		    
-		    UNION ALL
-		    
-		    SELECT 
-		        DATE_FORMAT(PROJCTUDT, '%Y-%m-%d %H:%i') AS logDate,
-		        CONCAT('[', PROJCTUMB, '] 프로젝트 수정') AS logMessage
-		    FROM netprojct
-		    WHERE PROJCTSEQ = #{projctSeq} AND PROJCTUDT IS NOT NULL
-		) AS logs
-		ORDER BY logDate DESC;
-    </select>
+	<select id="selectProjectLog" parameterType="int" resultType="map">
+	    SELECT logDate, logMessage
+	    FROM (
+	        -- 프로젝트 등록 로그
+	        SELECT 
+	            DATE_FORMAT(p.PROJCTCDT, '%Y-%m-%d %H:%i') AS logDate,
+	            CONCAT('[', m.MEMBERNAM, '] 프로젝트 등록') AS logMessage
+	        FROM netprojct p
+	        JOIN netmember m ON p.PROJCTCMB = m.MEMBERSEQ
+	        WHERE p.PROJCTSEQ = #{projctSeq}
+	        
+	        UNION ALL
+	        
+	        -- 프로젝트 수정 로그
+	        SELECT 
+	            DATE_FORMAT(p.PROJCTUDT, '%Y-%m-%d %H:%i') AS logDate,
+	            CONCAT('[', m.MEMBERNAM, '] 프로젝트 수정') AS logMessage
+	        FROM netprojct p
+	        JOIN netmember m ON p.PROJCTUMB = m.MEMBERSEQ
+	        WHERE p.PROJCTSEQ = #{projctSeq} 
+	          AND p.PROJCTUDT IS NOT NULL
+	    ) AS logs
+	    ORDER BY logDate DESC;
+	</select>
     
     <!-- 프로젝트 삭제 -->
     <delete id="deleteProject">