From 026247f677110ae199124a67c68503729cbaec92 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 30 Jun 2023 00:38:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、暂时对用户 Mapper 的 selectList 和 selectPage 进行了数据权限过滤；
2、由于对用户 Mapper 的 selectList 添加了数据权限过滤，请小心使用 selectOne 因为其底层使用的也是 selectList；
3、tips：如需在查询时进行数据权限过滤，尽量不要对 MyBatis Plus 原生查询进行过滤，而是单独声明一个查询方法来使用，以避免不需要过滤数据权限查询数据的场景受到较大影响。
---
 .../cnadmin/system/mapper/UserMapper.java     | 31 ++++++++++++++++++-
 .../system/service/impl/UserServiceImpl.java  |  2 +-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserMapper.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserMapper.java
index 353764bd..76e84851 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserMapper.java
@@ -16,6 +16,16 @@
 
 package top.charles7c.cnadmin.system.mapper;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+
+import top.charles7c.cnadmin.common.annotation.DataPermission;
 import top.charles7c.cnadmin.common.base.BaseMapper;
 import top.charles7c.cnadmin.system.model.entity.UserDO;
 
@@ -25,4 +35,23 @@ import top.charles7c.cnadmin.system.model.entity.UserDO;
  * @author Charles7c
  * @since 2022/12/22 21:47
  */
-public interface UserMapper extends BaseMapper<UserDO> {}
+public interface UserMapper extends BaseMapper<UserDO> {
+
+    @Override
+    @DataPermission
+    List<UserDO> selectList(@Param(Constants.WRAPPER) Wrapper<UserDO> queryWrapper);
+
+    @Override
+    @DataPermission
+    <P extends IPage<UserDO>> P selectPage(P page, @Param(Constants.WRAPPER) Wrapper<UserDO> queryWrapper);
+
+    /**
+     * 根据用户名查询
+     *
+     * @param username
+     *            用户名
+     * @return 用户信息
+     */
+    @Select("SELECT * FROM `sys_user` WHERE `username` = #{username}")
+    UserDO selectByUsername(@Param("username") String username);
+}
diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
index cedf71fc..eaf95993 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
@@ -238,7 +238,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
 
     @Override
     public UserDO getByUsername(String username) {
-        return baseMapper.lambdaQuery().eq(UserDO::getUsername, username).one();
+        return baseMapper.selectByUsername(username);
     }
 
     @Override