|
|
@@ -771,6 +771,9 @@
|
|
|
e.total_amount totalAmout
|
|
|
from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
|
|
|
left join admin d on b.aid=d.id left join t_order_new e on a.order_no =e.order_no
|
|
|
+ <if test="uid != null">
|
|
|
+ left join public_release_details prd on a.id=prd.prid
|
|
|
+ </if>
|
|
|
where 1=1
|
|
|
<if test="publicType != null">
|
|
|
and a.type= #{publicType}
|
|
|
@@ -788,7 +791,7 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="uid != null">
|
|
|
- and a.uid = #{uid}
|
|
|
+ and prd.uid = #{uid}
|
|
|
</if>
|
|
|
<if test="releaseStart != null and releaseEnd != null">
|
|
|
and (a.release_start between #{releaseStart} and #{releaseEnd} or a.release_end between #{releaseStart} and #{releaseEnd})
|
|
|
@@ -812,6 +815,9 @@
|
|
|
select count(*)
|
|
|
from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
|
|
|
left join admin d on b.aid=d.id
|
|
|
+ <if test="uid != null">
|
|
|
+ left join public_release_details prd on a.id=prd.prid
|
|
|
+ </if>
|
|
|
where 1=1
|
|
|
<if test="publicType != null">
|
|
|
and a.type= #{publicType}
|
|
|
@@ -829,7 +835,7 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="uid != null">
|
|
|
- and a.uid = #{uid}
|
|
|
+ and prd.uid = #{uid}
|
|
|
</if>
|
|
|
<if test="releaseStart != null and releaseEnd != null">
|
|
|
and (a.release_start between #{releaseStart} and #{releaseEnd} or a.release_end between #{releaseStart} and #{releaseEnd})
|