Merge remote-tracking branch 'origin/master'

master
赵嘉伟 3 years ago
commit 86f5eaafd3

@ -1132,7 +1132,7 @@
INNER JOIN ITEM CP ON CP.HANDLE = ZCI.COMPONENT_BO INNER JOIN ITEM CP ON CP.HANDLE = ZCI.COMPONENT_BO
INNER JOIN ITEM_T ITT ON ITT.ITEM_BO = CP.HANDLE AND ITT.LOCALE = #{locale} INNER JOIN ITEM_T ITT ON ITT.ITEM_BO = CP.HANDLE AND ITT.LOCALE = #{locale}
LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = CP.HANDLE AND CFA."ATTRIBUTE" = 'MAT_SPEC' LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = CP.HANDLE AND CFA."ATTRIBUTE" = 'MAT_SPEC'
LEFT JOIN CUSTOM_FIELDS CFB ON CFA.HANDLE = CP.HANDLE AND CFB."ATTRIBUTE" = 'TEXTTURE' LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = CP.HANDLE AND CFB."ATTRIBUTE" = 'TEXTTURE'
WHERE ZCI.SITE = #{site} WHERE ZCI.SITE = #{site}
<if test="callItem.callType != null and callItem.callType != ''"> <if test="callItem.callType != null and callItem.callType != ''">
AND ZCI.CALL_TYPE = #{callItem.callType} AND ZCI.CALL_TYPE = #{callItem.callType}

Loading…
Cancel
Save