|
@@ -91,6 +91,9 @@
|
|
|
LEFT JOIN shop sh ON sh.shopID = p.shopID
|
|
|
<where>
|
|
|
s.validFlag = 1 and s.serviceProviderID not in (1371, 1342)
|
|
|
+ <if test="clubId != null">
|
|
|
+ AND ccr.clubId = #{clubId}
|
|
|
+ </if>
|
|
|
<if test="remarks != null and remarks !=''">
|
|
|
AND ccr.remarks LIKE concat('%',#{remarks},'%')
|
|
|
</if>
|
|
@@ -152,6 +155,9 @@
|
|
|
LEFT JOIN product p ON p.productID = ccr.productID
|
|
|
LEFT JOIN shop sh ON sh.shopID = p.shopID
|
|
|
<where>
|
|
|
+ <if test="clubId != null">
|
|
|
+ AND ccr.clubId = #{clubId}
|
|
|
+ </if>
|
|
|
<if test="remarks != null and remarks !=''">
|
|
|
AND ccr.remarks LIKE concat('%',#{remarks},'%')
|
|
|
</if>
|