|
|
@@ -424,7 +424,7 @@
|
|
|
left join district_glossory dg2 on d.location_city = dg2.id
|
|
|
left join district_glossory dg3 on d.location_area = dg3.id
|
|
|
left join user_mid um on um.aid=a.aid and um.uid=a.id
|
|
|
- where a.type= 1 and a.share_type=0 and a.source in(1,2,3)
|
|
|
+ where a.type= 1 and a.share_type=0 and a.source in(1,2,3) and a.channel=0
|
|
|
<if test="power ==0">
|
|
|
and a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -473,7 +473,7 @@
|
|
|
from user a left join admin b on a.aid=b.id
|
|
|
left join organization_identity d on a.id = d.uid left join district_glossory dg1 on d.location_province = dg1.id
|
|
|
left join district_glossory dg2 on d.location_city = dg2.id left join district_glossory dg3 on d.location_area = dg3.id
|
|
|
- where a.type= 1 and a.share_type=0 and a.source in(1,2,3)
|
|
|
+ where a.type= 1 and a.share_type=0 and a.source in(1,2,3) and a.channel=0
|
|
|
<if test="power ==0">
|
|
|
and a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -2154,9 +2154,10 @@ inner join(
|
|
|
</update>
|
|
|
|
|
|
<update id="updateReleaseUserChannel">
|
|
|
- update user a ,user_channel b set a.share_type=1,a.channel=0,
|
|
|
- b.status=6,a.transfer_time =now()
|
|
|
- where a.id=b.uid and a.id in(
|
|
|
+ update user a ,user_channel b,user_lock_release c set a.share_type=1,a.channel=0,
|
|
|
+ b.status=6,a.transfer_time =now(),c.release_time =now(),c.status =2
|
|
|
+ where a.id=b.uid and a.id=c.uid and a.aid=c.aid and c.status =0 and c.`type` =0
|
|
|
+ and a.id in(
|
|
|
<foreach item="item" collection="list" separator="," index="">
|
|
|
#{item.uid}
|
|
|
</foreach>
|