From b93a030e667a48e00926d121ff9eb029de72f857 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 06 八月 2024 19:36:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 4b35655..70b3d34 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
@@ -60,6 +60,9 @@
private SysUserRoleMapper userRoleMapper;
@Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
+
+ @Autowired
private SysUserPostMapper userPostMapper;
@Autowired
@@ -296,8 +299,16 @@
@Override
public boolean registerUser(SysUser user)
{
- System.out.println(user);
- return userMapper.insertUser(user) > 0;
+ int satisfyCount = userMapper.insertUser(user);
+ if (satisfyCount > 0) {
+ List<SysUserRole> roleList = new ArrayList<>();
+ SysUserRole roleId = new SysUserRole();
+ roleId.setUserId(user.getUserId());
+ roleId.setRoleId(2L);
+ roleList.add(roleId);
+ sysUserRoleMapper.batchUserRole(roleList);
+ }
+ return satisfyCount > 0;
}
/**
@@ -472,7 +483,7 @@
userRoleMapper.deleteUserRoleByUserId(userId);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
userPostMapper.deleteUserPostByUserId(userId);
- return userMapper.deleteUserById(userId);
+ return userMapper.deleteById(userId);
}
/**
@@ -539,6 +550,8 @@
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
String password = configService.selectConfigByKey("sys.user.initPassword");
+ List<SysUserRole> roleList = new ArrayList<>();
+
for (SysUser user : userList)
{
try
@@ -551,6 +564,10 @@
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
this.insertUser(user);
+ SysUserRole roleId = new SysUserRole();
+ roleId.setUserId(user.getUserId());
+ roleId.setRoleId(2L);
+ roleList.add(roleId);
successNum++;
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
}
@@ -578,6 +595,7 @@
log.error(msg, e);
}
}
+ sysUserRoleMapper.batchUserRole(roleList);
if (failureNum > 0)
{
failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");
--
Gitblit v1.9.1