Merge branch 'khj' into main

src/main/resources/mapper/localvoteMapper.xml

@@ -35,7 +35,7 @@
 		)
 	</insert>
 	<select id="selectVoteList" parameterType="map">
-    SELECT * FROM (
+ 	SELECT * FROM (
         SELECT 
             a.*,
             DATE_FORMAT(a.LOCVOTRDT, '%Y-%m-%d %H:%i') AS formatted_LOCVOTRDT,
@@ -60,13 +60,19 @@
         netmember b ON a.LOCVOTREG = b.MEMBERSEQ 
     LEFT JOIN 
         commoncod c ON b.MEMBERCOL = c.CMNCODVAL 
-    WHERE 1=1
+    WHERE 
+        1=1
     <include refid="searchConditions"/>
+    AND EXISTS (
+        SELECT 1 FROM votmember vm 
+        WHERE vm.LOCVOTSEQ = a.LOCVOTSEQ 
+        AND vm.MEMBERSEQ = #{userId}  -- 현재 사용자가 투표 가능 멤버인지 확인
+    )
     ) AS subquery
     WHERE 1=1
     <if test="myVote != null and myVote != ''">
 	    <choose>
-	        <when test='myVote == "1"'>
+	        <when test='myVote == "1"' >
 	            AND myvoted = 'Y'
 	        </when>
 	    </choose>