From 3ba8323cb7cc42f1441a41d998dad3e5512dbbae Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期一, 30 一月 2023 20:10:16 +0800
Subject: [PATCH] update 修改 BaseEntity 创建人, 修改人字段类型, 修改相关 LambdaQueryWrapper 类型判断 ; update 修改 CreateAndUpdateMetaObjectHandler#insertFill 字段填充保存相关参数id ;
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 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 d0df74d..2661890 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
@@ -10,19 +10,14 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
-import com.ruoyi.system.domain.SysDept;
-import com.ruoyi.system.domain.SysRole;
-import com.ruoyi.system.domain.SysUser;
-import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.mybatis.helper.DataBaseHelper;
-import com.ruoyi.common.satoken.utils.LoginHelper;
import com.ruoyi.common.core.utils.StreamUtils;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.system.domain.SysPost;
-import com.ruoyi.system.domain.SysUserPost;
-import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.common.mybatis.helper.DataBaseHelper;
+import com.ruoyi.common.satoken.utils.LoginHelper;
+import com.ruoyi.system.domain.*;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
@@ -30,8 +25,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -211,7 +204,6 @@
* 鏍￠獙鎵嬫満鍙风爜鏄惁鍞竴
*
* @param user 鐢ㄦ埛淇℃伅
- * @return
*/
@Override
public String checkPhoneUnique(SysUser user) {
@@ -228,7 +220,6 @@
* 鏍￠獙email鏄惁鍞竴
*
* @param user 鐢ㄦ埛淇℃伅
- * @return
*/
@Override
public String checkEmailUnique(SysUser user) {
@@ -296,8 +287,8 @@
*/
@Override
public boolean registerUser(SysUser user) {
- user.setCreateBy(user.getUserName());
- user.setUpdateBy(user.getUserName());
+ user.setCreateBy(user.getUserId());
+ user.setUpdateBy(user.getUserId());
return baseMapper.insert(user) > 0;
}
@@ -417,13 +408,12 @@
Long[] posts = user.getPostIds();
if (ArrayUtil.isNotEmpty(posts)) {
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
- List<SysUserPost> list = new ArrayList<>(posts.length);
- for (Long postId : posts) {
+ List<SysUserPost> list = StreamUtils.toList(List.of(posts), postId -> {
SysUserPost up = new SysUserPost();
up.setUserId(user.getUserId());
up.setPostId(postId);
- list.add(up);
- }
+ return up;
+ });
userPostMapper.insertBatch(list);
}
}
@@ -437,13 +427,12 @@
public void insertUserRole(Long userId, Long[] roleIds) {
if (ArrayUtil.isNotEmpty(roleIds)) {
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
- List<SysUserRole> list = new ArrayList<>(roleIds.length);
- for (Long roleId : roleIds) {
+ List<SysUserRole> list = StreamUtils.toList(List.of(roleIds), roleId -> {
SysUserRole ur = new SysUserRole();
ur.setUserId(userId);
ur.setRoleId(roleId);
- list.add(ur);
- }
+ return ur;
+ });
userRoleMapper.insertBatch(list);
}
}
@@ -477,7 +466,7 @@
checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId);
}
- List<Long> ids = Arrays.asList(userIds);
+ List<Long> ids = List.of(userIds);
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId, ids));
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
--
Gitblit v1.9.3