Merge remote-tracking branch 'origin/develop' into xodud1202

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

@@ -274,17 +274,13 @@
 		            </foreach>
 		        </if>
 		        <if test="styleYear != null and styleYear != ''">
-		        AND G.STYLE_YEAR = (SELECT CD_NM FROM TB_COMMON_CODE WHERE CD = #{styleYear} AND CD_GB='G023')
+		        AND G.STYLE_YEAR = #{styleYear}
 		        </if>
 		        <if test="multiStyleYear != null and multiStyleYear != ''">
-		        AND G.STYLE_YEAR IN (SELECT CD_NM 
-		                             FROM TB_COMMON_CODE 
-		                             WHERE CD_GB='G023' 
-		                             AND CD IN 
-		                             <foreach collection="multiStyleYear" item="item" index="index"  open="(" close=")" separator=",">
-		                             #{item}
-		                             </foreach>
-		                             )
+		        AND G.STYLE_YEAR IN 
+		            <foreach collection="multiStyleYear" item="item" index="index"  open="(" close=")" separator=",">
+		            #{item}
+		            </foreach>
 		        </if>
 		        <if test="seasonCd != null and seasonCd != ''">
 		        AND G.SEASON_CD = #{seasonCd}

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

@@ -88,17 +88,13 @@
 		            </foreach>
 		        </if>
 		        <if test="styleYear != null and styleYear != ''">
-		        AND G.STYLE_YEAR = (SELECT CD_NM FROM TB_COMMON_CODE WHERE CD = #{styleYear} AND CD_GB='G023')
+		        AND G.STYLE_YEAR = #{styleYear}
 		        </if>
 		        <if test="multiStyleYear != null and multiStyleYear != ''">
-		        AND G.STYLE_YEAR IN (SELECT CD_NM 
-		                             FROM TB_COMMON_CODE 
-		                             WHERE CD_GB='G023' 
-		                             AND CD IN 
-		                             <foreach collection="multiStyleYear" item="item" index="index"  open="(" close=")" separator=",">
-		                             #{item}
-		                             </foreach>
-		                             )
+		        AND G.STYLE_YEAR IN  
+		           <foreach collection="multiStyleYear" item="item" index="index"  open="(" close=")" separator=",">
+		           #{item}
+		           </foreach>
 		        </if>
 		        <if test="seasonCd != null and seasonCd != ''">
 		        AND G.SEASON_CD = #{seasonCd}