|
|
@@ -296,6 +296,7 @@
|
|
|
tb_iamberry_charger_receive t
|
|
|
LEFT JOIN tb_iamberry_user_userinfo iuu ON t.receive_open_id = iuu.user_openid
|
|
|
<where>
|
|
|
+ t.receive_status != 1
|
|
|
<if test="receiveId != null" >
|
|
|
AND t.receive_id = #{receiveId}
|
|
|
</if>
|
|
|
@@ -308,9 +309,6 @@
|
|
|
<if test="colorId != null" >
|
|
|
AND t.color_id = #{colorId}
|
|
|
</if>
|
|
|
- <if test="receiveStatus != null" >
|
|
|
- AND t.receive_status = #{receiveStatus}
|
|
|
- </if>
|
|
|
<if test="receiveCreateTime != null and receiveCreateTime != ''" >
|
|
|
AND DATE_FORMAT(t.receive_create_time,'%Y') = DATE_FORMAT(#{receiveCreateTime},'%Y')
|
|
|
</if>
|
