|
|
@@ -70,8 +70,6 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|
|
if (pwd.equals(user.getPassword())) {
|
|
|
StpUtil.login(user.getId());
|
|
|
// 用户名存入session,统一日志读取使用
|
|
|
- StpUtil.getSession().set("userId", user.getId());
|
|
|
- StpUtil.getSession().set("companyId", user.getCompanyId());
|
|
|
StpUtil.getSession().set("mobilePhone", user.getMobilePhone());
|
|
|
user.setLastLoginTime(LocalDateTime.now());
|
|
|
this.updateById(user);
|
|
|
@@ -115,10 +113,10 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|
|
var password = MD5.digestHex(adminUserVo.getPassword().concat(MD5.digestHex(adminUserVo.getMobilePhone()).substring(0, 5)));
|
|
|
// 用户
|
|
|
var adminUser = new AdminUser();
|
|
|
+ BeanUtils.copyProperties(adminUserVo, adminUser);
|
|
|
adminUser.setId(IDGenerator.INS().nextId());
|
|
|
adminUser.setPassword(password);
|
|
|
adminUser.setCreateTime(LocalDateTime.now());
|
|
|
- BeanUtils.copyProperties(adminUserVo, adminUser);
|
|
|
save(adminUser);
|
|
|
// 角色和权限
|
|
|
var adminUserRole = new AdminUserRole()
|
|
|
@@ -128,7 +126,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Object detail(int id) {
|
|
|
+ public Object detail(long id) {
|
|
|
AdminUser adminUser = baseMapper.selectById(id);
|
|
|
adminUser.setPassword(null);
|
|
|
List<AdminUserRole> userRoleList = adminUserRoleService.lambdaQuery().eq(AdminUserRole::getAdminUserId, id).list();
|
|
|
@@ -171,9 +169,6 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|
|
.like(CommUtil.isNotEmptyAndNull(params.getMobilePhone()), AdminUser::getMobilePhone, params.getMobilePhone())
|
|
|
.like(CommUtil.isNotEmptyAndNull(params.getStatus()), AdminUser::getStatus, params.getStatus())
|
|
|
.list();
|
|
|
- if (CommUtil.isNotEmptyAndNull(list)) {
|
|
|
- list.forEach(user -> user.setPassword(null));
|
|
|
- }
|
|
|
return new PageBean<>(list);
|
|
|
}
|
|
|
}
|