From 6e21c6472843d67bfb5dd590e33207a58d41695e Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期四, 02 三月 2023 22:09:51 +0800
Subject: [PATCH] !292 mapstruct-plus 接入替换 BeanUtil * add 新增 mapstruct-plus 用于实体类转换 ;

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index ee36fe5..a8e6418 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -1,6 +1,5 @@
 package com.ruoyi.system.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -14,6 +13,7 @@
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.service.UserService;
+import com.ruoyi.common.core.utils.MapstructUtils;
 import com.ruoyi.common.core.utils.StreamUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.mybatis.core.page.PageQuery;
@@ -250,7 +250,7 @@
      */
     @Override
     public void checkUserAllowed(SysUserBo user) {
-        if (ObjectUtil.isNotNull(user.getUserId()) && user.isAdmin()) {
+        if (ObjectUtil.isNotNull(user.getUserId()) && user.isSuperAdmin()) {
             throw new ServiceException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳鐢ㄦ埛");
         }
     }
@@ -262,7 +262,7 @@
      */
     @Override
     public void checkUserDataScope(Long userId) {
-        if (!LoginHelper.isAdmin()) {
+        if (!LoginHelper.isSuperAdmin()) {
             SysUserBo user = new SysUserBo();
             user.setUserId(userId);
             List<SysUserVo> users = this.selectUserList(user);
@@ -281,9 +281,10 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertUser(SysUserBo user) {
-        SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+        SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
         // 鏂板鐢ㄦ埛淇℃伅
         int rows = baseMapper.insert(sysUser);
+        user.setUserId(sysUser.getUserId());
         // 鏂板鐢ㄦ埛宀椾綅鍏宠仈
         insertUserPost(user);
         // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
@@ -298,10 +299,11 @@
      * @return 缁撴灉
      */
     @Override
-    public boolean registerUser(SysUserBo user) {
+    public boolean registerUser(SysUserBo user, String tenantId) {
         user.setCreateBy(user.getUserId());
         user.setUpdateBy(user.getUserId());
-        SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+        SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
+        sysUser.setTenantId(tenantId);
         return baseMapper.insert(sysUser) > 0;
     }
 
@@ -323,7 +325,7 @@
         userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));
         // 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
         insertUserPost(user);
-        SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+        SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
         return baseMapper.updateById(sysUser);
     }
 
@@ -349,7 +351,7 @@
      */
     @Override
     public int updateUserStatus(SysUserBo user) {
-        SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+        SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
         return baseMapper.updateById(sysUser);
     }
 
@@ -361,7 +363,7 @@
      */
     @Override
     public int updateUserProfile(SysUserBo user) {
-        SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+        SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
         return baseMapper.updateById(sysUser);
     }
 
@@ -388,7 +390,7 @@
      */
     @Override
     public int resetPwd(SysUserBo user) {
-        SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+        SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
         return baseMapper.updateById(sysUser);
     }
 

--
Gitblit v1.9.3