|
|
@@ -36,7 +36,17 @@
|
|
|
ORDER BY u.create_time desc
|
|
|
</select>
|
|
|
<select id="userStateStatisticsPage" resultType="com.ozs.service.entity.vo.UserStateStatisticsResp">
|
|
|
- SELECT * FROM (
|
|
|
+ SELECT
|
|
|
+ t.nikeName,
|
|
|
+ t.userName,
|
|
|
+ t.createTime,
|
|
|
+ t.isDisableName,
|
|
|
+ t.userId,
|
|
|
+ t.isDisable,
|
|
|
+ s.status AS sysUserStatus,
|
|
|
+ s.del_flag AS sysUserDelFlag
|
|
|
+ FROM
|
|
|
+ (
|
|
|
SELECT
|
|
|
u.nike_name AS nikeName,
|
|
|
u.user_name AS userName,
|
|
|
@@ -47,11 +57,16 @@
|
|
|
END AS isDisableName,
|
|
|
u.user_id AS userId,
|
|
|
u.is_disable AS isDisable,
|
|
|
- ROW_NUMBER() OVER (PARTITION BY u.user_id ORDER BY u.create_time DESC) as rn
|
|
|
+ ROW_NUMBER() OVER (PARTITION BY u.user_id ORDER BY u.create_time DESC) AS rn
|
|
|
FROM
|
|
|
user_state_statistics u
|
|
|
) t
|
|
|
- WHERE t.rn = 1
|
|
|
+ INNER JOIN sys_user s
|
|
|
+ ON t.userId = s.user_id
|
|
|
+ AND s.status = 1
|
|
|
+ AND s.del_flag = 1
|
|
|
+ WHERE
|
|
|
+ t.rn = 1
|
|
|
<if test="isDisable != null and isDisable != 0">
|
|
|
AND t.isDisable = #{isDisable}
|
|
|
</if>
|