From 114685cc870d0e00dc157656ae9039f285d3f5f1 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期五, 30 十一月 2018 15:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/push/PushGoodsMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/push/PushGoodsMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/push/PushGoodsMapper.xml
index 24ac597..59e9b68 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/push/PushGoodsMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/push/PushGoodsMapper.xml
@@ -67,7 +67,7 @@
<delete id="deleteBatchByPrimaryKey" parameterType="java.util.List">
- delete from yeshi_ec_push_goods where gro_id in
+ delete from yeshi_ec_push_goods where pg_id in
<foreach item="item" collection="list" open="(" separator=","
close=")">#{item}</foreach>
</delete>
@@ -98,19 +98,21 @@
<select id="listHistoryByPushTime" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" /> FROM yeshi_ec_push_goods
- WHERE pg_is_push = 1 AND <![CDATA[pg_push_time >= #{pushTime}]]>
+ WHERE pg_is_push = 1 AND <![CDATA[pg_push_time >= #{pushTime}]]>
+ AND (pg_uid is null <if test='uid != null'>or pg_uid = #{uid} </if>)
ORDER BY pg_push_time desc
LIMIT ${start},${count}
</select>
<select id="countHistoryByPushTime" resultType="java.lang.Long">
SELECT IFNULL(count(pg_id),0) FROM yeshi_ec_push_goods
- WHERE pg_is_push = 1 AND <![CDATA[pg_push_time >= #{pushTime}]]>
+ WHERE pg_is_push = 1 AND <![CDATA[pg_push_time >= #{pushTime}]]>
+ AND (pg_uid is null <if test='uid != null'>or pg_uid = #{uid} </if>)
</select>
<select id="listByPushState" resultMap="BaseResultMap" parameterType="java.util.List">
SELECT <include refid="Base_Column_List" /> FROM yeshi_ec_push_goods
- WHERE pg_is_push = 1 AND gro_id in
+ WHERE pg_is_push = 1 AND pg_id in
<foreach item="item" collection="list" open="(" separator=","
close=")">#{item}</foreach>
</select>
--
Gitblit v1.8.0