Merge branch 'sowon' into develop

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -1689,13 +1689,13 @@ public class TsfMypageController extends TsfBaseController {
 		
 		review.setReviewExpireDay(eventService.getGoodsReviewPointExpireDays(TscConstants.Site.STYLE24.value()));
 		result.set("alreadyReviewCount", reviewService.getAlreadyReviewList(review).size());
-		TscPageRequest pageable2 = new TscPageRequest((review.getPageNo2() > 0 ? review.getPageNo2() - 1 : 0), review.getPageSize2(), review.getPageUnit2());
+		TscPageRequest pageable = new TscPageRequest((review.getPageNo() > 0 ? review.getPageNo() - 1 : 0), review.getPageSize(), review.getPageUnit());
 		int totalCnt = reviewService.getAlreadyReviewList(review).size();
-		pageable2.setTotalCount(totalCnt);
-		review.setPageable2(pageable2);
+		pageable.setTotalCount(totalCnt);
+		review.setPageable(pageable);
 		result.set("paging2", review);
 		result.set("totalCnt", totalCnt);
-		result.set("endRow", pageable2.getEndRow());
+		result.set("endRow", pageable.getEndRow());
 		result.set("dataList2", reviewService.getAlreadyReviewList(review));
 
 		return result;

src/main/java/com/style24/persistence/mybatis/shop/TsfReview.xml

@@ -1157,7 +1157,7 @@
 		        , Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD, Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.BRAND_ENM, Z.ORD_DTL_STAT_NM
 		        , Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY, Z.REVIEW_SQ 
 		ORDER BY Z.ORD_NO DESC, Z.ORD_DTL_STAT, Z.SELF_GOODS_YN DESC, Z.SHOT_DELV_YN DESC, Z.SUPPLY_COMP_CD
-		<include refid="selectForPagingFooter2"/>
+		<include refid="selectForPagingFooter"/>
 		</select>
 	
 	<select id="getReviewAttach" parameterType="Review" resultType="Review">

src/main/webapp/WEB-INF/views/web/mypage/MypageReviewFormWeb.html

@@ -103,8 +103,8 @@
 				<input type="hidden" name="pageSize" value="10" />
 			</form>
 			<form id="searchForm2" name="searchForm2" th:action="@{'/mypage/already/review/list'}" th:method="post">
-				<input type="hidden" name="pageNo2" value="1" />
-				<input type="hidden" name="pageSize2" value="10" />
+				<input type="hidden" name="pageNo" value="1" />
+				<input type="hidden" name="pageSize" value="10" />
 			</form>
 
 	<script src="/ux/plugins/gaga/gaga.paging.js"></script>
@@ -204,7 +204,6 @@
 		$('#nodata2').hide();
 		
 		$('#reviewList').html('');
-		
 		if (result.dataList2 != null && result.dataList2.length > 0) {
 			$.each(result.dataList2, function(idx, item) {
 				let html = '';
@@ -364,8 +363,7 @@
 			$('#nodata2').show();
 		}
 		// Create pagination
-		console.log(result.paging2.pageable2);
-		gagaPaging.createPagination(result.paging2.pageable2);
+		gagaPaging.createPagination(result.paging2.pageable);
 		
 	}