|
@@ -640,7 +640,7 @@
|
|
|
t.holderdays,
|
|
t.holderdays,
|
|
|
t.tradetime,
|
|
t.tradetime,
|
|
|
ua.usertype,
|
|
ua.usertype,
|
|
|
- parent.accountname as parentusername
|
|
|
|
|
|
|
+ parent.accountname as parentusername,
|
|
|
m.marketname,
|
|
m.marketname,
|
|
|
t.expiredate,
|
|
t.expiredate,
|
|
|
t.expiretype,
|
|
t.expiretype,
|
|
@@ -703,7 +703,7 @@
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
<if test="vo.areaUserid != null and vo.areaUserid != 0 and vo.areaUserid != 1">
|
|
<if test="vo.areaUserid != null and vo.areaUserid != 0 and vo.areaUserid != 1">
|
|
|
- and (rua.memberuserid = #{areaUserid} or rua.parentuserid = #{vo.areaUserid})
|
|
|
|
|
|
|
+ and (rua.memberuserid = #{vo.areaUserid} or rua.parentuserid = #{vo.areaUserid})
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
order by t.tradetime desc,t.accountid desc
|
|
order by t.tradetime desc,t.accountid desc
|
