Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.batch.git into develop

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

@@ -247,7 +247,7 @@
 		WITH TAB_FILTER AS (
 		    SELECT C4.SITE_CD
 		         , C4.CATE_GB
-		         , C4.FORMAL_GB
+		         , G.FORMAL_GB
 		         , CG.BRAND_GROUP_NO
 		         , C4.CATE1_NO
 		         , C4.CATE2_NO
@@ -378,7 +378,7 @@
 		WITH TAB_FILTER AS (
 		    SELECT C4.SITE_CD
 		         , C4.CATE_GB
-		         , C4.FORMAL_GB
+		         , G.FORMAL_GB
 		         , CG.BRAND_GROUP_NO
 		         , C4.CATE1_NO
 		         , C4.CATE2_NO
@@ -555,7 +555,7 @@
 		WITH TAB_FILTER AS (
 		    SELECT C4.SITE_CD
 		         , C4.CATE_GB
-		         , C4.FORMAL_GB
+		         , G.FORMAL_GB
 		         , CG.BRAND_GROUP_NO
 		         , C4.CATE1_NO
 		         , C4.CATE2_NO
@@ -712,7 +712,8 @@
 		            GROUP  BY SITE_CD, CATE_GB, FORMAL_GB, BRAND_GROUP_NO, CATE1_NO
 		           ) Z
 		)
-		SELECT SITE_CD
+		SELECT DISTINCT
+		       SITE_CD
 		     , CATE_GB
 		     , FORMAL_GB
 		     , BRAND_GROUP_NO
@@ -721,7 +722,7 @@
 		     , FILTER_CD
 		     , FILTER_NM
 		     , RANK() OVER(PARTITION BY SITE_CD, CATE_GB, FORMAL_GB, BRAND_GROUP_NO, CATE_NO
-		                   ORDER BY DISP_ORD
+		                   ORDER BY FILTER_CD
 		                   )  AS DISP_ORD
 		FROM   (
 		        SELECT SITE_CD
@@ -731,7 +732,6 @@
 		             , CATE_NO
 		             , PRICE1         AS FILTER_CD
 		             , PRICE1         AS FILTER_NM
-		             , 1              AS DISP_ORD
 		        FROM   TAB_PRICE
 		        UNION ALL
 		        SELECT SITE_CD
@@ -741,7 +741,6 @@
 		             , CATE_NO
 		             , PRICE2         AS FILTER_CD
 		             , PRICE2         AS FILTER_NM
-		             , 2              AS DISP_ORD
 		        FROM   TAB_PRICE
 		        UNION ALL
 		        SELECT SITE_CD
@@ -751,7 +750,6 @@
 		             , CATE_NO
 		             , PRICE3         AS FILTER_CD
 		             , PRICE3         AS FILTER_NM
-		             , 3              AS DISP_ORD
 		        FROM   TAB_PRICE
 		        UNION ALL
 		        SELECT SITE_CD
@@ -761,7 +759,6 @@
 		             , CATE_NO
 		             , PRICE4         AS FILTER_CD
 		             , PRICE4         AS FILTER_NM
-		             , 4              AS DISP_ORD
 		        FROM   TAB_PRICE
 		        UNION ALL
 		        SELECT SITE_CD
@@ -771,7 +768,6 @@
 		             , CATE_NO
 		             , PRICE5         AS FILTER_CD
 		             , PRICE5         AS FILTER_NM
-		             , 5              AS DISP_ORD
 		        FROM   TAB_PRICE
 		        UNION ALL
 		        SELECT SITE_CD
@@ -781,7 +777,6 @@
 		             , CATE_NO
 		             , PRICE6         AS FILTER_CD
 		             , PRICE6         AS FILTER_NM
-		             , 6              AS DISP_ORD
 		        FROM   TAB_PRICE
 		       ) Z
 	</insert>