From adeaa77864792872f7e39bb9d3560c07d75c1873 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 14 四月 2021 12:01:26 +0800
Subject: [PATCH] update mp化

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 74c265c..aece9d0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -16,8 +16,7 @@
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,12 +30,9 @@
  *
  * @author ruoyi
  */
+@Slf4j
 @Service
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
-    private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
-
-    @Autowired
-    private SysUserMapper userMapper;
 
     @Autowired
     private SysRoleMapper roleMapper;
@@ -62,7 +58,7 @@
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user) {
-        return userMapper.selectUserList(user);
+        return baseMapper.selectUserList(user);
     }
 
     /**
@@ -73,7 +69,7 @@
      */
     @Override
     public SysUser selectUserByUserName(String userName) {
-        return userMapper.selectUserByUserName(userName);
+        return baseMapper.selectUserByUserName(userName);
     }
 
     /**
@@ -84,7 +80,7 @@
      */
     @Override
     public SysUser selectUserById(Long userId) {
-        return userMapper.selectUserById(userId);
+        return baseMapper.selectUserById(userId);
     }
 
     /**
@@ -198,7 +194,7 @@
     @Transactional
     public int insertUser(SysUser user) {
         // 鏂板鐢ㄦ埛淇℃伅
-        int rows = userMapper.insert(user);
+        int rows = baseMapper.insert(user);
         // 鏂板鐢ㄦ埛宀椾綅鍏宠仈
         insertUserPost(user);
         // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
@@ -224,7 +220,7 @@
         userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));
         // 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
         insertUserPost(user);
-        return userMapper.updateById(user);
+        return baseMapper.updateById(user);
     }
 
     /**
@@ -235,7 +231,7 @@
      */
     @Override
     public int updateUserStatus(SysUser user) {
-        return userMapper.updateById(user);
+        return baseMapper.updateById(user);
     }
 
     /**
@@ -246,7 +242,7 @@
      */
     @Override
     public int updateUserProfile(SysUser user) {
-        return userMapper.updateById(user);
+        return baseMapper.updateById(user);
     }
 
     /**
@@ -258,7 +254,7 @@
      */
     @Override
     public boolean updateUserAvatar(String userName, String avatar) {
-        return userMapper.update(null,
+        return baseMapper.update(null,
                 new LambdaUpdateWrapper<SysUser>()
                         .set(SysUser::getAvatar,avatar)
                         .eq(SysUser::getUserName,userName)) > 0;
@@ -272,7 +268,7 @@
      */
     @Override
     public int resetPwd(SysUser user) {
-        return userMapper.updateById(user);
+        return baseMapper.updateById(user);
     }
 
     /**
@@ -284,7 +280,7 @@
      */
     @Override
     public int resetUserPwd(String userName, String password) {
-        return userMapper.update(null,
+        return baseMapper.update(null,
                 new LambdaUpdateWrapper<SysUser>()
                         .set(SysUser::getPassword,password)
                         .eq(SysUser::getUserName,userName));
@@ -351,7 +347,7 @@
         userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
         userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));
-        return userMapper.deleteById(userId);
+        return baseMapper.deleteById(userId);
     }
 
     /**
@@ -371,7 +367,7 @@
         userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId,ids));
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
         userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId,ids));
-        return userMapper.deleteBatchIds(ids);
+        return baseMapper.deleteBatchIds(ids);
     }
 
     /**
@@ -395,7 +391,7 @@
         for (SysUser user : userList) {
             try {
                 // 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
-                SysUser u = userMapper.selectUserByUserName(user.getUserName());
+                SysUser u = baseMapper.selectUserByUserName(user.getUserName());
                 if (Validator.isNull(u)) {
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);

--
Gitblit v1.9.3