Commit fa4aa2fb by shenjunjie

后台用户列表模块调整2

parent 072707e2
......@@ -191,6 +191,7 @@ public class UserServiceImpl implements UserService {
roles.add(UserRole.createFromUserDto(userDTO));
Update update = new Update();
update.set("roles", roles);
update.set("submitter", nickname);
userDao.updateOneByIdWithField(userDTO.getId(), update);
return ResponseResult.success();
}
......@@ -204,6 +205,7 @@ public class UserServiceImpl implements UserService {
List<UserRole> roles = user.getRoles().stream().filter(userRole -> !userRole.getProjectId().equals(pid)).collect(Collectors.toList());
Update update = new Update();
update.set("roles", roles);
update.set("submitter", UserThreadLocal.getNickname());
userDao.updateOneByIdWithField(userId, update);
}
......@@ -247,14 +249,15 @@ public class UserServiceImpl implements UserService {
User user = userDao.findOneById(userDTO.getId());
// 老用户
if (null != user) {
if (!user.isSuperAdmin()) {
if (user.isSuperAdmin()) {
return ResponseResult.success();
}
Update update = new Update();
update.set("superAdmin", true);
update.set("roles", null);
update.set("submitter", nickname);
userDao.updateOneByIdWithField(user.getId(), update);
return ResponseResult.success();
}
}
// 新用户
User newUser;
// 优先使用用户中心信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment