From dedeae3d9343d9c0e67dc97f579a3fdf96f42244 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Tue, 13 Dec 2022 01:01:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/youlai/system/mapper/SysUserMapper.java | 3 +++ src/main/resources/mapper/SysUserMapper.xml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/youlai/system/mapper/SysUserMapper.java b/src/main/java/com/youlai/system/mapper/SysUserMapper.java index b2528d1c..1fbdb185 100644 --- a/src/main/java/com/youlai/system/mapper/SysUserMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysUserMapper.java @@ -2,6 +2,7 @@ package com.youlai.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.youlai.system.common.annotation.DataPermission; import com.youlai.system.pojo.bo.UserBO; import com.youlai.system.pojo.entity.SysUser; import com.youlai.system.pojo.bo.UserAuthInfo; @@ -28,6 +29,7 @@ public interface SysUserMapper extends BaseMapper { * @param queryParams 查询参数 * @return */ + @DataPermission(deptAlias = "u") Page listUserPages(Page page, UserPageQuery queryParams); /** @@ -52,5 +54,6 @@ public interface SysUserMapper extends BaseMapper { * @param queryParams * @return */ + @DataPermission(deptAlias = "u") List listExportUsers(UserPageQuery queryParams); } diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml index 63762335..d14928e8 100644 --- a/src/main/resources/mapper/SysUserMapper.xml +++ b/src/main/resources/mapper/SysUserMapper.xml @@ -19,9 +19,9 @@ u.create_time FROM sys_user u - LEFT JOIN sys_dept d ON u.dept_id = d.id - LEFT JOIN sys_user_role sur ON u.id = sur.user_id - LEFT JOIN sys_role r ON sur.role_id = r.id + LEFT JOIN sys_dept d ON u.dept_id = d.id + LEFT JOIN sys_user_role sur ON u.id = sur.user_id + LEFT JOIN sys_role r ON sur.role_id = r.id u.deleted = 0 AND u.username != 'root'