|
|
@@ -611,7 +611,6 @@
|
|
|
left join district_glossory dg2 on b.location_city = dg2.id
|
|
|
left join district_glossory dg3 on b.location_area = dg3.id
|
|
|
left join industry_category c on b.industry = c.id
|
|
|
- left join user_channel uc on a.id=uc.uid
|
|
|
left join admin d on a.aid = d.id where a.share_type =2
|
|
|
<if test="aid != null and aid != ''">
|
|
|
and a.aid = #{aid}
|
|
|
@@ -1633,7 +1632,7 @@
|
|
|
select b.id,b.identify_name as name from
|
|
|
(select uid from user_lock_release where type = 0 and status = 0 and aid = #{aid} group by uid) a
|
|
|
inner join user b on a.uid = b.id
|
|
|
- where b.status != 1 and b.identify_name like concat('%',#{name},'%')
|
|
|
+ where b.status != 1 and b.channel =0 and b.identify_name like concat('%',#{name},'%')
|
|
|
</select>
|
|
|
|
|
|
<select id="selectSignedCustomerByName" resultType="com.goafanti.customer.bo.CustomerSimpleBo">
|
|
|
@@ -2161,17 +2160,17 @@ inner join(
|
|
|
|
|
|
<update id="updateReleaseUserChannel">
|
|
|
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
|
|
|
+ b.status=7,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(
|
|
|
+ and b.status in (0,1,2) and a.id in(
|
|
|
<foreach item="item" collection="list" separator="," index="">
|
|
|
#{item.uid}
|
|
|
</foreach>
|
|
|
)
|
|
|
</update>
|
|
|
<select id="checkBeforeChannel" resultType="java.lang.String">
|
|
|
- select b.aid from user_channel a
|
|
|
+ select b.aid from user_channel a
|
|
|
left join user b on a.uid =b.id
|
|
|
- where a .uid = #{uid}
|
|
|
+ where a.status=8 and a.uid = #{uid}
|
|
|
</select>
|
|
|
</mapper>
|