Merge branch 'stage_tsit' of https://style24@dev.azure.com/style24/style24/_git/style24.batch into stage_tsit

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

@@ -118,6 +118,10 @@
 		WHERE G.SELF_MALL_YN = 'Y'                 -- 자사몰 노출
 		AND G.GOODS_STAT = 'G008_90'               -- 상품상태 승인완료
 		AND NOW() BETWEEN SELL_STDT AND SELL_EDDT  -- 현재 판매가능기간
+		AND (CASE WHEN G.GOODS_TYPE = 'G056_N' AND SELF_GOODS_YN = 'Y' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = G.GOODS_CD AND OPT_CD1 = O.OPT_CD1)
+	     		 WHEN G.GOODS_TYPE = 'G056_N' AND SELF_GOODS_YN = 'N' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = G.GOODS_CD)
+	            ELSE (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = G.GOODS_CD)
+             END) > 0 	-- 재고있는건
 	</insert>
 
 	<!-- 상품검색 temp 상품키워드 생성 -->