메인전시 컨텐츠+상품 수정

src/main/java/com/style24/front/biz/service/TsfDisplayService.java

@@ -438,7 +438,7 @@ public class TsfDisplayService {
 			tempCate.setContentsLoc(data.getContentsLoc());
 			tempCate.setMaxRow(10);
 			tempCate.setCustNo(TsfSession.isLogin() ? TsfSession.getInfo().getCustNo() : 0);
-			tempCate.setCate1No(data.getCateNo());
+			tempCate.setCateNo(data.getCateNo());
 			tempCate.setSiteCd(data.getSiteCd());
 			tempCate.setCateGb(data.getCateGb());
 			data.setGoodsList(goodsDao.getContentsCategoryGoodsList(tempCate));

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

@@ -205,6 +205,10 @@ public class TsfDisplayController extends TsfBaseController {
 				mainLayout.setMdPickList(displayService.getContentsForGoods(contents));
 			}
 
+			if (contentsLoc.equals("SMM003")||contentsLoc.equals("SBM007")){
+				mainLayout.setNewItemList(displayService.getContentsForGoods(contents));
+			}
+
 			mainLayoutList.add(mainLayout);
 		}
 
@@ -338,6 +342,11 @@ public class TsfDisplayController extends TsfBaseController {
 					cate4Srch.setMaxRow(50);
 					Collection<Goods> goodsList = goodsService.getContentsCategoryGoodsList(cate4Srch);
 					brandMain.setGoodsList(goodsList);
+				}else if(contentsLoc.equals("SBM017") || contentsLoc.equals("SBM018")||contentsLoc.equals("SBM019")){
+					cate4Srch.setBrandGroupNo(brandMain.getBrandGroupNo());
+					cate4Srch.setMaxRow(20);
+					Collection<Goods> goodsList = goodsService.getContentsCategoryGoodsList(cate4Srch);
+					brandMain.setGoodsList(goodsList);
 				}
 				brandMain.setContentsList(displayService.getContentsList(contents));
 			} else {
@@ -458,6 +467,7 @@ public class TsfDisplayController extends TsfBaseController {
 				for (Contents contentsData : conList) {
 					cate.setContentsLoc("SCM003");
 					cate.setMaxRow(Integer.parseInt(contentsData.getStrVar1()));
+					cate.setCateNo(contents.getCateNo());
 					mav.addObject("bestGoodsList", goodsService.getContentsCategoryGoodsList(cate));
 				}
 			}

src/main/java/com/style24/persistence/domain/MainLayout.java

@@ -35,5 +35,6 @@ public class MainLayout extends TscBaseDomain {
     private Collection<Contents> mdPickList;
     private Collection<Contents> brandPickList;
     private Collection<Contents> bestItemList;
+    private Collection<Contents> newItemList;
 
 }

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

@@ -1391,14 +1391,18 @@
 		WHERE 1 = 1
 		<if test="maxRownum != null and maxRownum > 0">
 		LIMIT #{maxRownum}
-		</if> 
+		</if>
 	</select>
 	
 	<!-- 컨텐츠카테고리상품 목록 -->
 	<select id="getContentsCategoryGoodsList"  parameterType="Cate4Srch" resultType="Goods">
 		/* TsfGoods.getContentsCategoryGoodsList */
 		WITH TAB_GOODS AS (
-		    SELECT G.BRAND_GROUP_NM     /*브랜드그룹명*/
+		    SELECT
+		           <if test="contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003'">
+					   DISTINCT
+				   </if>
+		           G.BRAND_GROUP_NM     /*브랜드그룹명*/
 		         , G.GOODS_CD           /*상품코드*/
 		         , G.GOODS_NM           /*상품명*/
 		         , G.GOODS_GB           /*상품구분*/
@@ -1412,11 +1416,15 @@
 		         , G.CURR_PRICE         /*현재판매가*/
 		         , G.REG_DT             /*등록일시*/
 		         , G.DISP_ORD
-		         <if test="contentsLoc == 'SCM002'">
+		         <if test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'">
 		         , G.SELL_WEEK_QTY
 		         </if>
 		    FROM   (
-		            SELECT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
+		            SELECT
+		                   <if test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'">
+		                      DISTINCT
+		                   </if>
+		                   CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
 		                            BG.BRAND_GROUP_ENM
 		                        ELSE
 		                            BG.BRAND_GROUP_KNM
@@ -1437,33 +1445,72 @@
 		            <choose>
 		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'">
 		                 , CT.DISP_ORD
-		                 </when>
+		                </when>
+		                <when test="contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003'">
+		                , CTG.DISP_ORD
+		                </when>
 		                 <otherwise>
 		                 , CG.DISP_ORD
 		                 </otherwise>
 		            </choose>
-		            <if test="contentsLoc == 'SCM002'">
-		                , GS.SELL_WEEK_QTY
-		            </if>
 		            <if test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'">
-		                , C4.CATE1_NO
+		                 , GS.SELL_WEEK_QTY
+		                 , CT.CATE_NO AS CATE1_NO
 		            </if>
 		            <choose>
-		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
+		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012' or contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003'"> <!-- md추천 -->
 		                    FROM	TB_CONTENTS CT
 		                    , TB_CONTENTS_GOODS CTG
 		                    , TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
 		                    , TB_GOODS_STOCK S
 		                    , TB_BRAND B
 		                    , TB_BRAND_GROUP BG
+		                    <if test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'">
+		                    , TB_GOODS_SUMMARY GS
+		                    </if>
 		                    WHERE	CT.CONTENTS_LOC = CTG.CONTENTS_LOC
 		                    AND 	CT.DISP_ORD = CTG.CONTENTS_SQ
+		                    <if test="contentsLoc == 'SCM003' or contentsLoc == 'SCM002'">
+		                    AND    CT.CATE_NO = CTG.CATE_NO
+		                    </if>
+		                    <if test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'"> <!-- 베스트 -->
+		                    AND    CTG.GOODS_CD = GS.GOODS_CD
+		                    </if>
 		                    AND		CTG.GOODS_CD = G.GOODS_CD
 		                    AND		CTG.GOODS_CD = S.GOODS_CD
 		                    AND		G.BRAND_CD = B.BRAND_CD
 		                    AND     B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
 		                    AND		CT.CONTENTS_LOC = #{contentsLoc}
+		                    <if test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'">
 		                    AND 	CTG.CONTENTS_SQ = #{dispOrd}
+		                    </if>
+		                    <if test="contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003'">
+		                    AND CT.CONTENTS_SQ IN ( SELECT TMP.CONTENTS_SQ FROM (SELECT A.CONTENTS_SQ FROM TB_CONTENTS A WHERE 1=1 AND A.CONTENTS_LOC = #{contentsLoc} AND NOW() BETWEEN A.DISP_STDT AND A.DISP_EDDT
+		                                                                                    <if test="brandGroupNo != null and brandGroupNo != ''">
+		                                                                                        AND A.BRAND_GROUP_NO = #{brandGroupNo}
+		                                                                                    </if>
+		                                                                                    <if test="contentsLoc=='SCM003'">
+		                                                                                        <if test="cateNo != null and cateNo != ''">
+		                                                                                        AND A.CATE_NO = #{cateNo}
+		                                                                                        </if>
+		                                                                                    </if>
+		                                                                                    <if test="contentsLoc=='SCM002'">
+		                                                                                        <if test="cate1No != null and cate1No != ''">
+		                                                                                            AND A.CATE_NO = #{cate1No}
+		                                                                                        </if>
+		                                                                                    </if>
+		                                                                                    <if test="pageGb != null and pageGb == 'BEST'">
+		                                                                                        <if test="cate1No != null and cate1No != ''">
+		                                                                                        AND A.CATE_NO = #{cate1No}
+		                                                                                        </if>
+		                                                                                    </if>
+		                                                                                    AND A.USE_YN = 'Y' ORDER BY A.CONTENTS_SQ
+		                                                                                    <if test="pageGb == null and pageGb != 'BEST'">
+		                                                                                    LIMIT 1
+		                                                                                    </if>
+		                                                                          ) AS TMP
+		                                                              )
+		                    </if>
 		                    AND		NOW() BETWEEN CT.DISP_STDT AND CT.DISP_EDDT
 		                </when>
 		                <otherwise>
@@ -1473,7 +1520,7 @@
 		                    , TB_GOODS_STOCK S
 		                    , TB_BRAND B
 		                    , TB_BRAND_GROUP BG
-		                    <if test="contentsLoc == 'SCM002'"> <!-- 베스트 -->
+		                    <if test="contentsLoc == 'SCM003'"> <!-- 베스트 -->
 		                    , TB_GOODS_SUMMARY GS
 		                    </if>
 		                    WHERE  C4.LEAF_CATE_NO = CG.CATE_NO
@@ -1489,7 +1536,7 @@
 		                    AND    CG.GOODS_CD = S.GOODS_CD
 		                    AND    G.BRAND_CD = B.BRAND_CD
 		                    AND    B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-		                    <if test="contentsLoc == 'SCM002'"> <!-- 베스트 -->
+		                    <if test="contentsLoc == 'SCM003'"> <!-- 베스트 -->
 		                    AND    CG.GOODS_CD = GS.GOODS_CD
 	                        </if>
 	                        AND    C4.SITE_CD = #{siteCd}
@@ -1515,13 +1562,13 @@
 		            AND    B.USE_YN = 'Y'
 		            AND    BG.USE_YN = 'Y'
 		            <if test="pageGb != null and pageGb == 'BEST'">
-		            ORDER BY C4.CATE1_NO
+		            ORDER BY CT.CATE_NO
 		            LIMIT 100
 		            </if>
 		           ) G
 		    WHERE  1=1
 		<choose>
-		    <when test="contentsLoc == 'SCM113'"> <!-- 베스트 -->
+		    <when test="contentsLoc == 'SCM013'"><!-- 베스트 -->
 		     ORDER BY G.SELL_WEEK_QTY DESC , G.GOODS_CD
 		    </when>
 		    <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
@@ -1624,7 +1671,6 @@
 		           , G.LIST_PRICE         /*정상가(최초판매가)*/
 		           , G.CURR_PRICE         /*현재판매가*/
 		           , G.REG_DT             /*등록일시*/
-		           , G.NUMB
 		           FROM   (
 		                    SELECT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
 		                    BG.BRAND_GROUP_ENM
@@ -1642,86 +1688,97 @@
 		                    , G.LIST_PRICE                                             /*정상가(최초판매가)*/
 		                    , G.CURR_PRICE                                             /*현재판매가*/
 		                    , G.REG_DT                                                 /*등록일시*/
-		             <choose>
-		             	<when test="contentsLoc == 'SCM002'"> <!-- 베스트 -->
-		             		, ROW_NUMBER() OVER(ORDER BY GS.SELL_WEEK_QTY DESC
-		             		, G.GOODS_CD) AS NUMB
-		             	</when>
-		             	<when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
-		             		, ROW_NUMBER() OVER(ORDER BY CTG.DISP_ORD
-		             		, G.REG_DT DESC
-		             		, G.GOODS_CD) AS NUMB
-		             	</when>
-		             	<when test="contentsLoc == 'SCM002' or (contentsLoc == 'SCM003' and pageGb == null)"> <!-- md추천 -->
-		             		, ROW_NUMBER() OVER(ORDER BY CG.DISP_ORD ,G.UPD_DT DESC, G.CURR_PRICE DESC, G.GOODS_CD ASC) AS NUMB
-		             	</when>
-		             	<when test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'">
-		             		, ROW_NUMBER() OVER(ORDER BY C4.CATE1_NO, CG.DISP_ORD ,G.UPD_DT DESC, G.CURR_PRICE DESC, G.GOODS_CD ASC) AS NUMB
-		             	</when>
-		             	<otherwise>
-		             		, ROW_NUMBER() OVER(ORDER BY CG.DISP_ORD
-		             		, G.REG_DT DESC
-		             		, G.GOODS_CD) AS NUMB
-		             	</otherwise>
-		             </choose>
-		<choose>
-		        	<when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
-		        		FROM	TB_CONTENTS CT
-		        		, TB_CONTENTS_GOODS CTG
-		        		, TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
-		        		, TB_GOODS_STOCK S
-		        		, TB_BRAND B
-		        		, TB_BRAND_GROUP BG
-		        		WHERE	CT.CONTENTS_LOC = CTG.CONTENTS_LOC
-		        		AND 	CT.DISP_ORD = CTG.CONTENTS_SQ
-		        		AND		CTG.GOODS_CD = G.GOODS_CD
-		        		AND		CTG.GOODS_CD = S.GOODS_CD
-		        		AND		G.BRAND_CD = B.BRAND_CD
-		        		AND     B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-		        		AND		CT.CONTENTS_LOC = #{contentsLoc}
-		        		AND 	CTG.CONTENTS_SQ = #{dispOrd}
-		        		AND		NOW() BETWEEN CT.DISP_STDT AND CT.DISP_EDDT
-		        	</when>
-		        	<otherwise>
-		        		FROM   TB_CATE_4SRCH C4
-		        		, TB_CATE_GOODS CG
-		        		, TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
-		        		, TB_GOODS_STOCK S
-		        		, TB_BRAND B
-		        		, TB_BRAND_GROUP BG
-		        		<if test="contentsLoc == 'SCM002'"> <!-- 베스트 -->
-		        			, TB_GOODS_SUMMARY GS
-		        		</if>
-		        		WHERE  C4.LEAF_CATE_NO = CG.CATE_NO
-		        		<choose>
-		        			<when test="brandGroupNo != null and brandGroupNo != ''">
-		        				AND    CG.BRAND_GROUP_NO = #{brandGroupNo}</when>
-		        			<otherwise>
-		        				AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
-		        			</otherwise>
-		        		</choose>
-		        		AND    CG.GOODS_CD = G.GOODS_CD
-		        		AND    CG.GOODS_CD = S.GOODS_CD
-		        		AND    G.BRAND_CD = B.BRAND_CD
-		        		AND    B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-		        		<if test="contentsLoc == 'SCM002'"> <!-- 베스트 -->
-		        			AND    CG.GOODS_CD = GS.GOODS_CD
-		        		</if>
-		        		AND    C4.SITE_CD = #{siteCd}
-		        		AND    C4.CATE_GB = #{cateGb}
-		        		AND    C4.CATE_TYPE = 'G031_20' /*컨텐츠카테고리*/
-		        		<choose>
-		        			<when test="pageGb != null and pageGb == 'BEST'">
-		        				<if test="cate1No != null and cate1No != ''">
-		        					AND    C4.CATE1_NO = #{cate1No}
-		        				</if>
-		        			</when>
-		        			<otherwise>
-		        				AND    C4.CATE1_NO = #{cate1No}
-		        			</otherwise>
-		        		</choose>
-		        		AND    C4.CONTENTS_LOC = #{contentsLoc}
-		        	</otherwise>
+		        <choose>
+		            <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012' or contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003'">
+		                FROM	TB_CONTENTS CT
+		                , TB_CONTENTS_GOODS CTG
+		                , TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
+		                , TB_GOODS_STOCK S
+		                , TB_BRAND B
+		                , TB_BRAND_GROUP BG
+		                <if test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'">
+		                	, TB_GOODS_SUMMARY GS
+		                </if>
+		                WHERE	CT.CONTENTS_LOC = CTG.CONTENTS_LOC
+		                AND 	CT.DISP_ORD = CTG.CONTENTS_SQ
+		                <if test="contentsLoc == 'SCM003'">
+		                AND    CT.CATE_NO = CTG.CATE_NO
+		                </if>
+		                <if test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'"> <!-- 베스트 -->
+		                AND    CTG.GOODS_CD = GS.GOODS_CD
+		                </if>
+		                AND		CTG.GOODS_CD = G.GOODS_CD
+		                AND		CTG.GOODS_CD = S.GOODS_CD
+		                AND		G.BRAND_CD = B.BRAND_CD
+		                AND     B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		                AND		CT.CONTENTS_LOC = #{contentsLoc}
+		                <if test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'">
+		                AND 	CTG.CONTENTS_SQ = #{dispOrd}
+		                </if>
+		                <if test="contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003'">
+		                    AND CT.CONTENTS_SQ IN ( SELECT TMP.CONTENTS_SQ FROM (SELECT A.CONTENTS_SQ FROM TB_CONTENTS A WHERE 1=1 AND A.CONTENTS_LOC = #{contentsLoc} AND NOW() BETWEEN A.DISP_STDT AND A.DISP_EDDT
+		                                                                                 <if test="brandGroupNo != null and brandGroupNo != ''">
+		                                                                                 AND A.BRAND_GROUP_NO = #{brandGroupNo}
+		                                                                                 </if>
+		                                                                                 <if test="contentsLoc=='SCM003'">
+		                                                                                     <if test="cateNo != null and cateNo != ''">
+		                                                                                 AND A.CATE_NO = #{cateNo}
+		                                                                                     </if>
+		                                                                                 </if>
+		                                                                                 <if test="pageGb != null and pageGb == 'BEST'">
+		                                                                                     <if test="cate1No != null and cate1No != ''">
+		                                                                                 AND    A.CATE_NO = #{cate1No}
+		                                                                                     </if>
+		                                                                                 </if>
+		                                                                                 AND A.USE_YN = 'Y' ORDER BY A.CONTENTS_SQ
+		                                                                                 <if test="pageGb == null and pageGb != 'BEST'">
+		                                                                                 LIMIT 1
+		                                                                                 </if>
+		                                                                            ) AS TMP
+		                                         )
+		                </if>
+		                AND		NOW() BETWEEN CT.DISP_STDT AND CT.DISP_EDDT
+		            </when>
+		            <otherwise>
+		                FROM   TB_CATE_4SRCH C4
+		                , TB_CATE_GOODS CG
+		                , TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
+		                , TB_GOODS_STOCK S
+		                , TB_BRAND B
+		                , TB_BRAND_GROUP BG
+		                <if test="contentsLoc == 'SCM003'"> <!-- 베스트 -->
+		                , TB_GOODS_SUMMARY GS
+		                </if>
+		                WHERE  C4.LEAF_CATE_NO = CG.CATE_NO
+		                <choose>
+		                    <when test="brandGroupNo != null and brandGroupNo != ''">
+		                        AND    CG.BRAND_GROUP_NO = #{brandGroupNo}</when>
+		                    <otherwise>
+		                        AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
+		                    </otherwise>
+		                </choose>
+		                AND    CG.GOODS_CD = G.GOODS_CD
+		                AND    CG.GOODS_CD = S.GOODS_CD
+		                AND    G.BRAND_CD = B.BRAND_CD
+		                AND    B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		                <if test="contentsLoc == 'SCM003'"> <!-- 베스트 -->
+		                AND    CG.GOODS_CD = GS.GOODS_CD
+		                </if>
+		                AND    C4.SITE_CD = #{siteCd}
+		                AND    C4.CATE_GB = #{cateGb}
+		                AND    C4.CATE_TYPE = 'G031_20' /*컨텐츠카테고리*/
+		                <choose>
+		                    <when test="pageGb != null and pageGb == 'BEST'">
+		                        <if test="cate1No != null and cate1No != ''">
+		                        AND    C4.CATE1_NO = #{cate1No}
+		                        </if>
+		                    </when>
+		                    <otherwise>
+		                        AND    C4.CATE1_NO = #{cate1No}
+		                    </otherwise>
+		                </choose>
+		                AND    C4.CONTENTS_LOC = #{contentsLoc}
+		            </otherwise>
 		        </choose>
 		        AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
 		        AND    G.SELF_MALL_YN = 'Y'   /*몰노출상품*/
@@ -1730,22 +1787,22 @@
 		        AND    B.USE_YN = 'Y'
 		        AND    BG.USE_YN = 'Y'
 		        <if test="pageGb != null and pageGb == 'BEST'">
-		        	ORDER BY C4.CATE1_NO
+		        	ORDER BY CT.CATE_NO
 		        </if>
 		        ) G
 		    WHERE  1=1
 		    <if test="pageable != null and pageable.endRow != null and pageable.endRow > 0">
-		    	AND  G.NUMB BETWEEN #{pageable.startRow} AND #{pageable.endRow}
+		    LIMIT #{pageable.limitStartRow} , #{pageable.pageSize}
 		    </if>
 		    <if test="maxRow != null and maxRow !=''">
-		    	AND  G.NUMB <![CDATA[<=]]> #{maxRow}
+		    LIMIT #{maxRow}
 		    </if>
 		    )
 		SELECT COUNT(1) AS CNT
 		FROM TAB_GOODS G
 		<if test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
-			LEFT OUTER JOIN TB_WISHLIST W ON G.GOODS_CD = W.GOODS_CD
-			AND W.CUST_NO = #{custNo}
+		    LEFT OUTER JOIN TB_WISHLIST W ON G.GOODS_CD = W.GOODS_CD
+		    AND W.CUST_NO = #{custNo}
 		</if>
 	</select>