From 4f9263aeee1c7e5a87a7ff58d008fb1c47ceed6b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 28 九月 2025 10:12:19 +0800
Subject: [PATCH] 增加同步引流平台的开关的功能
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 3912442..db25f62 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -130,6 +130,7 @@
user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setRoleType(1);
+ user.setPassWordUpdate(new Date());
userService.insertUser(user);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(user.getRoleId());
@@ -256,13 +257,10 @@
//删除旧的角色数据，添加新的角色
userRoleService.remove(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, user.getUserId()));
//添加新的角色数据
- Long[] roleIds = user.getRoleIds();
- for (Long roleId : roleIds) {
- SysUserRole userRole = new SysUserRole();
- userRole.setUserId(user.getUserId());
- userRole.setRoleId(roleId);
- userRoleService.save(userRole);
- }
+ SysUserRole userRole = new SysUserRole();
+ userRole.setUserId(user.getUserId());
+ userRole.setRoleId(user.getRoleId());
+ userRoleService.save(userRole);
//删除旧的站点数据后添加新的
userSiteClient.delUserSite(user.getUserId());
@@ -441,6 +439,7 @@
sysUser.setNickName(companyUserListVo.getNickName());
sysUser.setCreateBy(SecurityUtils.getUsername());
sysUser.setCreateTime(new Date());
+ sysUser.setPassWordUpdate(new Date());
userService.insertUser(sysUser);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(20l);
@@ -476,6 +475,7 @@
sysUser.setObjectId(dto.getRepairId());
sysUser.setUserName(add.getPhonenumber());
sysUser.setNickName(add.getPhonenumber());
+ sysUser.setPassWordUpdate(new Date());
userService.insertUser(sysUser);
userIds.add(sysUser.getUserId().intValue());
}
@@ -496,7 +496,7 @@
public R<LoginUser> info(@PathVariable("username") String username) {
SysUser sysUser = userService.selectUserByUserName(username);
if (StringUtils.isNull(sysUser)) {
- return R.fail("用户名或密码错误");
+ return R.fail("用户名/密码错误");
}
// 角色集合
Set<String> roles = permissionService.getRolePermission(sysUser);
@@ -506,7 +506,6 @@
sysUserVo.setSysUser(sysUser);
sysUserVo.setRoles(roles);
sysUserVo.setPermissions(permissions);
-
return R.ok(sysUserVo);
}
@@ -721,6 +720,7 @@
if(null == user.getRoleType()){
user.setRoleType(1);
}
+ user.setPassWordUpdate(new Date());
userService.insertUser(user);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(user.getRoleId());
--
Gitblit v1.7.1