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

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 id="selectProjectLog" parameterType="int" resultType="map">
-       	SELECT logDate, logMessage
+	    SELECT logDate, logMessage
-		FROM (
+	    FROM (
-		    SELECT 
+	        -- 프로젝트 등록 로그
-		        DATE_FORMAT(PROJCTCDT, '%Y-%m-%d %H:%i') AS logDate,
+	        SELECT 
-		        CONCAT('[', PROJCTCMB, '] 프로젝트 등록') AS logMessage
+	            DATE_FORMAT(p.PROJCTCDT, '%Y-%m-%d %H:%i') AS logDate,
-		    FROM netprojct
+	            CONCAT('[', m.MEMBERNAM, '] 프로젝트 등록') AS logMessage
-		    WHERE PROJCTSEQ = #{projctSeq}
+	        FROM netprojct p
+	        JOIN netmember m ON p.PROJCTCMB = m.MEMBERSEQ
+	        WHERE p.PROJCTSEQ = #{projctSeq}
 	        
-		    UNION ALL
+	        UNION ALL
 	        
-		    SELECT 
+	        -- 프로젝트 수정 로그
-		        DATE_FORMAT(PROJCTUDT, '%Y-%m-%d %H:%i') AS logDate,
+	        SELECT 
-		        CONCAT('[', PROJCTUMB, '] 프로젝트 수정') AS logMessage
+	            DATE_FORMAT(p.PROJCTUDT, '%Y-%m-%d %H:%i') AS logDate,
-		    FROM netprojct
+	            CONCAT('[', m.MEMBERNAM, '] 프로젝트 수정') AS logMessage
-		    WHERE PROJCTSEQ = #{projctSeq} AND PROJCTUDT IS NOT NULL
+	        FROM netprojct p
-		) AS logs
+	        JOIN netmember m ON p.PROJCTUMB = m.MEMBERSEQ
-		ORDER BY logDate DESC;
+	        WHERE p.PROJCTSEQ = #{projctSeq} 
-    </select>
+	          AND p.PROJCTUDT IS NOT NULL
+	    ) AS logs
+	    ORDER BY logDate DESC;
+	</select>
     
     <!-- 프로젝트 삭제 -->
     <delete id="deleteProject">