|
|
@@ -854,6 +854,9 @@
|
|
|
AND CATE4_NO = #{cate4No}
|
|
|
</if>
|
|
|
)
|
|
|
+ <if test="contentsLoc != null and contentsLoc !=''">
|
|
|
+ AND A.CONTENTS_LOC = #{contentsLoc}
|
|
|
+ </if>
|
|
|
) A
|
|
|
<if test="searchGb == null or searchGb =='BASIC'">
|
|
|
, TB_GOODS G
|
|
|
@@ -902,11 +905,13 @@
|
|
|
, G.SUPPLY_GOODS_CD
|
|
|
, G.STYLE_YEAR
|
|
|
, FN_GET_CODE_NM('G009',IFNULL(G.FORMAL_GB,'10')) AS FORMAL_GB
|
|
|
+ , A.CONTENTS_LOC
|
|
|
FROM ( SELECT A.GOODS_CD
|
|
|
, A.CATE_NO
|
|
|
, A.DISP_ORD
|
|
|
, A.REG_NO
|
|
|
, A.REG_DT
|
|
|
+ , A.CONTENTS_LOC
|
|
|
FROM TB_CATE_GOODS A
|
|
|
WHERE 1=1
|
|
|
AND A.CATE_NO IN ( SELECT LEAF_CATE_NO
|
|
|
@@ -925,6 +930,9 @@
|
|
|
AND CATE4_NO = #{cate4No}
|
|
|
</if>
|
|
|
)
|
|
|
+ <if test="contentsLoc != null and contentsLoc !=''">
|
|
|
+ AND A.CONTENTS_LOC = #{contentsLoc}
|
|
|
+ </if>
|
|
|
) A
|
|
|
<if test="searchGb == null or searchGb =='BASIC'">
|
|
|
, TB_GOODS G
|