用户状态统计列表开发

business-service/src/main/resources/mapper/service/UserStateStatisticsMapper.xml

@@ -43,28 +43,47 @@
         t.isDisableName,
         t.userId,
         t.isDisable,
-        s.status AS sysUserStatus,
-        s.del_flag AS sysUserDelFlag
+        s.dept_id
         FROM
         (
         SELECT
         u.nike_name AS nikeName,
         u.user_name AS userName,
         u.create_time AS createTime,
-        CASE u.is_disable
-        WHEN 1 THEN '在线'
-        WHEN 2 THEN '离线'
+        CASE
+        u.is_disable
+        WHEN 1 THEN
+        '在线'
+        WHEN 2 THEN
+        '离线'
         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
-        INNER JOIN sys_user s
-        ON t.userId = s.user_id
-        AND s.status = 1
+        INNER JOIN sys_user s ON t.userId = s.user_id
+        AND s.STATUS = 1
         AND s.del_flag = 1
+        AND s.dept_id IN (
+        SELECT
+        dept_id
+        FROM
+        sys_dept
+        WHERE
+        dept_name = '工务部'
+        AND STATUS = 1
+        AND del_flag = 1 UNION ALL
+        SELECT
+        dept_id
+        FROM
+        sys_dept
+        WHERE
+        parent_id = ( SELECT dept_id FROM sys_dept WHERE dept_name = '工务部' AND STATUS = 1 AND del_flag = 1 )
+        AND STATUS = 1
+        AND del_flag = 1
+        )
         WHERE
         t.rn = 1
         <if test="isDisable != null and isDisable != 0">