From 9ca97fd558700e7054c5f54192a9db7a1e6b8230 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 16:31:47 +0800
Subject: [PATCH] 完善导出等接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 4db6ccd..43e1d87 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
@@ -295,7 +295,7 @@
{
Long userId = user.getUserId();
// 删除用户与角色关联
-// userRoleMapper.deleteUserRoleByUserId(userId);
+ userRoleMapper.deleteUserRoleByUserId(userId);
// 新增用户与角色管理
insertUserRoleId(user);
// 删除用户与岗位关联
@@ -614,11 +614,6 @@
}
@Override
- public int updateUserIfBlack(List<Long> ids) {
- return userMapper.updateUserIfBlack(ids);
- }
-
- @Override
public List<SysUser> selectAllList() {
return userMapper.selectAllList();
}
@@ -646,20 +641,35 @@
SysUser sysUser = new SysUser();
sysUser.setUserName(dto.getAccount());
sysUser.setNickName(dto.getShopHead());
+ if(dto.getShopType() ==1){
+ sysUser.setRoleType(2);
+ }else {
+ sysUser.setRoleType(3);
+ }
sysUser.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
this.insertUser(sysUser);
// TODO 自动绑定角色
+
}
@Override
public void updateAccount(TShopDTO dto) {
- SysUser sysUser = this.selectUserByUserName(dto.getAccount());
+// SysUser sysUser = this.selectUserByUserName(dto.getAccount());
+ SysUser sysUser = this.selectUserById(dto.getUserId());
if(Objects.isNull(sysUser)){
throw new ServiceException("未查询到该账号");
}
sysUser.setUserName(dto.getAccount());
sysUser.setNickName(dto.getShopHead());
- sysUser.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ if(dto.getShopType() ==1){
+ sysUser.setRoleType(2);
+ }else {
+ sysUser.setRoleType(3);
+ }
+ if(Objects.nonNull(dto.getPassword())){
+ sysUser.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ }
+ sysUser.setStatus(dto.getAccountStatus());
this.updateUser(sysUser);
}
--
Gitblit v1.7.1