Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main

src/main/resources/mapper/localbordMapper.xml

@@ -32,6 +32,7 @@
 	        b.LOCBRDCON AS content,
 	        b.LOCBRDUDT AS date,
 	        b.LOCBRDCNT AS cnt,
+	        b.LOCBRDNIC AS nickname,
 	        m.MEMBERNAM AS author
 	    FROM localbord b
 	    LEFT JOIN netmember m ON b.MEMBERSEQ = m.MEMBERSEQ
@@ -58,8 +59,8 @@
 	
     <!-- 게시물 작성 -->
     <insert id="insertBoard" parameterType="map" useGeneratedKeys="true" keyProperty="LOCBRDSEQ">
-	    INSERT INTO localbord (LOCBRDTTL, LOCBRDCON, LOCBRDCAT, MEMBERSEQ, LOCBRDCNT, LOCBRDRDT, LOCBRDUDT, LOCBRDPWD, LOCBRDTYP)
-	    VALUES (#{LOCBRDTTL}, #{LOCBRDCON}, #{LOCBRDCAT}, #{MEMBERSEQ}, 0, NOW(), NOW(), #{LOCBRDPWD}, #{LOCBRDTYP})
+	    INSERT INTO localbord (LOCBRDTTL, LOCBRDCON, LOCBRDCAT, MEMBERSEQ, LOCBRDCNT, LOCBRDRDT, LOCBRDUDT, LOCBRDPWD, LOCBRDTYP, LOCBRDNIC)
+	    VALUES (#{LOCBRDTTL}, #{LOCBRDCON}, #{LOCBRDCAT}, #{MEMBERSEQ}, 0, NOW(), NOW(), #{LOCBRDPWD}, #{LOCBRDTYP}, #{LOCBRDNIC})
 	</insert>
   
     <!-- 첨부파일 저장 -->
@@ -133,6 +134,7 @@
 	        b.LOCBRDUDT AS date, 
 	        b.LOCBRDTYP AS type, 
 	        b.LOCBRDCNT AS cnt,
+	        b.LOCBRDNIC AS nickname,
 	        m.MEMBERNAM AS author,
 	        m.MEMBERSEQ AS authorId,
 	        m.MEMBERPRF AS profileImg
@@ -149,6 +151,7 @@
 	        b.LOCBRDCON AS content, 
 	        b.LOCBRDUDT AS date, 
 	        b.LOCBRDTYP AS type, 
+	        b.LOCBRDNIC AS nickname,
 	        b.LOCBRDCNT AS cnt,
 	        b.LOCBRDPWD AS password,
 	        m.MEMBERNAM AS author,
@@ -299,8 +302,7 @@
     <!-- 댓글 삭제 -->
 	<update id="updateSoftDeleteComment">
 	    UPDATE localcomt
-	    SET LOCCMTRPY = '삭제된 댓글입니다',
-	        LOCCMTUDT = NOW()
+	    SET LOCCMTRPY = '삭제된 댓글입니다'
 	    WHERE LOCCMTSEQ = #{LOCCMTSEQ}
 	      AND EXISTS (
 	          SELECT 1 FROM localcomt WHERE LOCCMTPNT = #{LOCCMTSEQ}

src/main/resources/mapper/localvoteMapper.xml

@@ -45,6 +45,8 @@
             b.MEMBERCOL,
             b.MEMBERPRF,
             c.CMNCODNAM AS usercolor,
+            (SELECT COUNT(*) FROM votmember vm WHERE vm.LOCVOTSEQ = a.LOCVOTSEQ) AS total_votable,
+        	(SELECT COUNT(*) FROM votrecord v WHERE v.LOCVOTSEQ = a.LOCVOTSEQ) AS total_voted,
             CASE 
                 WHEN EXISTS (
                     SELECT 1 
@@ -66,7 +68,7 @@
     AND EXISTS (
         SELECT 1 FROM votmember vm 
         WHERE vm.LOCVOTSEQ = a.LOCVOTSEQ 
-        AND vm.MEMBERSEQ = #{userId}  -- 현재 사용자가 투표 가능 멤버인지 확인
+        AND vm.MEMBERSEQ = #{userId}
     )
     ) AS subquery
     WHERE 1=1