프로젝트 정렬 및 로그 조회 로직 수정

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>
 
 
@@ -82,19 +82,24 @@
 	<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}
+	            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(PROJCTUDT, '%Y-%m-%d %H:%i') AS logDate,
-		        CONCAT('[', PROJCTUMB, '] 프로젝트 수정') AS logMessage
-		    FROM netprojct
-		    WHERE PROJCTSEQ = #{projctSeq} AND PROJCTUDT IS NOT NULL
+	            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>