From eb17f1a14e2e84e0c9bc59d10f000fb9959e13f0 Mon Sep 17 00:00:00 2001
From: khj0414 <khj0414@local-host.co.kr>
Date: Tue, 1 Apr 2025 16:18:08 +0900
Subject: [PATCH] =?UTF-8?q?=ED=88=AC=ED=91=9C=20=EC=9A=A9=EC=96=B4?=
 =?UTF-8?q?=EC=A7=91=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localhost/controller/api/VoteBoardController.java        | 2 +-
 .../java/io/company/localhost/service/worddictyService.java  | 5 +++++
 src/main/resources/mapper/localvoteMapper.xml                | 4 ++++
 src/main/resources/mapper/worddictyMapper.xml                | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/company/localhost/controller/api/VoteBoardController.java b/src/main/java/io/company/localhost/controller/api/VoteBoardController.java
index 87e9e9a..97e641b 100644
--- a/src/main/java/io/company/localhost/controller/api/VoteBoardController.java
+++ b/src/main/java/io/company/localhost/controller/api/VoteBoardController.java
@@ -30,7 +30,7 @@ public class VoteBoardController {
 	
 	 /**
 	    * 투표목록조회
-	    * @param page 페이지번호 , myVote 내가한투표 :1 투표안한것 :0 , 전체:0,투표마감:1,투표중:2
+	    * @param page 페이지번호 , myVote 내가한투표 :1 투표안한것 :0 , 전체:0, voteset 투표마감:1,투표중:2
 	    * @return
 	    */
 		@Member
diff --git a/src/main/java/io/company/localhost/service/worddictyService.java b/src/main/java/io/company/localhost/service/worddictyService.java
index cdb943c..7cde650 100644
--- a/src/main/java/io/company/localhost/service/worddictyService.java
+++ b/src/main/java/io/company/localhost/service/worddictyService.java
@@ -38,6 +38,11 @@ public class worddictyService {
 	private final FileService fileService;
  
 	public List<MapDto> selectWordList(MapDto map) {
+		if( map.getString("pageNum") != null) {
+			String pageNumStr = map.getString("pageNum");
+			int pageNum = Integer.parseInt(pageNumStr);
+			map.put("pageNum", pageNum);
+		}
 		List<MapDto> wordList = worddictymapper.selectWordList(map);  
         String keyword = map.getString("searchKeyword");
 
diff --git a/src/main/resources/mapper/localvoteMapper.xml b/src/main/resources/mapper/localvoteMapper.xml
index 9b5d3ce..f441812 100644
--- a/src/main/resources/mapper/localvoteMapper.xml
+++ b/src/main/resources/mapper/localvoteMapper.xml
@@ -78,6 +78,10 @@
 	            AND myvoted = 'Y'
 	            AND LOCVOTDEL IS NULL
 	        </when>
+	        <when test='myVote == "2"' >
+	            AND myvoted = 'N'
+	            AND LOCVOTDEL IS NULL
+	        </when>
 	    </choose>
     </if>
     ORDER BY formatted_LOCVOTRDT DESC
diff --git a/src/main/resources/mapper/worddictyMapper.xml b/src/main/resources/mapper/worddictyMapper.xml
index d194d26..7dba480 100644
--- a/src/main/resources/mapper/worddictyMapper.xml
+++ b/src/main/resources/mapper/worddictyMapper.xml
@@ -183,6 +183,9 @@
 		and w.WRDDICEDT IS NULL
       	<include refid="searchConditions"/>
 	     order by w.WRDDICRDT desc
+    	<if test="pageNum != null and pageNum != ''">
+    	limit #{pageNum}
+    	</if>
 	</select>
 	<select id="getTotal" parameterType="map" >
 	select count(*) from worddicty w