|
|
@@ -1053,16 +1053,16 @@
|
|
|
select a.id as aid,a.name as aName,d.name as depName,ifnull(b.userCount,0) as userCount,ifnull(c.timeCount,0) as inputCount,
|
|
|
ifnull(d.timeCount,0) as receiveCount from admin a
|
|
|
left join (select aid,count(aid) as userCount from user where aid is not null
|
|
|
- and share_type=0 and source !=0 and type=1
|
|
|
+ and share_type in (0,2) and source !=0 and type=1
|
|
|
group by aid) b on a.id=b.aid
|
|
|
left join (select aid,count(aid) as timeCount from `user` where aid is not null
|
|
|
- and share_type=0 and source =1 and type=1
|
|
|
+ and share_type in (0,2) and source =1 and type=1
|
|
|
<if test="startTime != null and endTime != null">
|
|
|
and create_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
group by aid) c on a.id=c.aid
|
|
|
left join (select aid,count(aid) as timeCount from `user` where aid is not null
|
|
|
- and share_type=0 and source =2 and type=1
|
|
|
+ and share_type in (0,2) and source =2 and type=1
|
|
|
<if test="startTime != null and endTime != null">
|
|
|
and transfer_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -1122,7 +1122,7 @@ select a.id,a.nickname as name,a.source,c.name contacts,c.mobile as contactMobil
|
|
|
and a.source in (1,2,3)
|
|
|
</if>
|
|
|
<if test="type==0 or type==1 or type==2 ">
|
|
|
- and a.share_type=0
|
|
|
+ and a.share_type in(0,2)
|
|
|
</if>
|
|
|
<if test="type == 1">
|
|
|
and a.source =1
|
|
|
@@ -1170,7 +1170,7 @@ select a.id,a.nickname as name,a.source,c.name contacts,c.mobile as contactMobil
|
|
|
and a.source in (1,2,3) and a.share_type=0
|
|
|
</if>
|
|
|
<if test="type==0 or type==1 or type==2 ">
|
|
|
- and a.share_type=0
|
|
|
+ and a.share_type in(0,2)
|
|
|
</if>
|
|
|
<if test="type == 1">
|
|
|
and a.source =1
|