|
@@ -82,7 +82,7 @@
|
|
|
s.user_id,DATE_FORMAT(s.operation_time, '%Y-%m-%d' ) as time
|
|
s.user_id,DATE_FORMAT(s.operation_time, '%Y-%m-%d' ) as time
|
|
|
FROM sys_user s
|
|
FROM sys_user s
|
|
|
<where>
|
|
<where>
|
|
|
- s.type = 3
|
|
|
|
|
|
|
+ s.type = 3 and s.status in (1, 4, 5, 6, 7)
|
|
|
<if test="userId != null ">
|
|
<if test="userId != null ">
|
|
|
and s.referrer_id = #{userId}
|
|
and s.referrer_id = #{userId}
|
|
|
</if>
|
|
</if>
|
|
@@ -103,6 +103,7 @@
|
|
|
s.user_id,DATE_FORMAT(s.operation_time, '%Y-%m-%d' ) as time
|
|
s.user_id,DATE_FORMAT(s.operation_time, '%Y-%m-%d' ) as time
|
|
|
FROM sys_user s
|
|
FROM sys_user s
|
|
|
<where>
|
|
<where>
|
|
|
|
|
+ s.status in (1, 4, 5, 6, 7)
|
|
|
<if test="deptIds != null and deptIds != '' and deptIds.size() > 0">
|
|
<if test="deptIds != null and deptIds != '' and deptIds.size() > 0">
|
|
|
AND s.dept_id in
|
|
AND s.dept_id in
|
|
|
<foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
|
|
<foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
|
