|
|
@@ -409,6 +409,7 @@
|
|
|
date_format(t0.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
|
|
|
t0.identify_name as name,
|
|
|
t0.society_tag as societyTag,
|
|
|
+ t0.level,
|
|
|
date_format(t1.last_follow_time,'%Y-%m-%d %H:%i:%S') as lastFollowTime,
|
|
|
date_format(t2.last_sign_time,'%Y-%m-%d %H:%i:%S') as lastSignTime,
|
|
|
b.contacts,
|
|
|
@@ -420,7 +421,7 @@
|
|
|
if(t0.transfer_time < t1.last_follow_time,t1.last_follow_time,t0.transfer_time) as orderTime,
|
|
|
d.name as adminName
|
|
|
from
|
|
|
- (select id,aid,type,share_type,transfer_time,create_time,identify_name,society_tag from user where aid = #{aid} and type = 1 and share_type = 0 and status != 1)t0
|
|
|
+ (select id,aid,type,share_type,transfer_time,create_time,identify_name,society_tag,level from user where aid = #{aid} and type = 1 and share_type = 0 and status != 1)t0
|
|
|
left join
|
|
|
(select uid,aid,max(create_time) as last_follow_time from user_follow where aid = #{aid} group by uid)t1
|
|
|
on t0.id = t1.uid left join
|
|
|
@@ -453,6 +454,9 @@
|
|
|
<if test="area != null">
|
|
|
and b.location_area = #{area,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
+ <if test="level != null">
|
|
|
+ and t0.level = #{level,jdbcType=INTEGER}
|
|
|
+ </if>
|
|
|
order by orderTime
|
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
|
@@ -462,7 +466,7 @@
|
|
|
select
|
|
|
count(0)
|
|
|
from
|
|
|
- (select id,aid,type,share_type,transfer_time,identify_name,society_tag from user where aid = #{aid} and type = 1 and share_type = 0 and status != 1)t0
|
|
|
+ (select id,aid,type,share_type,transfer_time,identify_name,society_tag,level from user where aid = #{aid} and type = 1 and share_type = 0 and status != 1)t0
|
|
|
left join organization_identity b on t0.id = b.uid where 1=1
|
|
|
<if test="aid != null and aid !=''">
|
|
|
and t0.aid = #{aid,jdbcType=VARCHAR}
|
|
|
@@ -485,6 +489,9 @@
|
|
|
<if test="area != null">
|
|
|
and b.location_area = #{area,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
+ <if test="level != null">
|
|
|
+ and t0.level = #{level,jdbcType=INTEGER}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
<select id="selectPublicOrganizationCustomerList" resultType="com.goafanti.customer.bo.CustomerListOut">
|
|
|
select
|