Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -208,7 +208,7 @@ public class UserController extends BaseController {
|
|||||||
// 同步管理员的产品套餐ID
|
// 同步管理员的产品套餐ID
|
||||||
if(user.getIsAdmin() != null){
|
if(user.getIsAdmin() != null){
|
||||||
final User superAdmin = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIsAdmin, 1).eq(User::getUsername, "superAdmin").last("limit 1"));
|
final User superAdmin = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIsAdmin, 1).eq(User::getUsername, "superAdmin").last("limit 1"));
|
||||||
user.setTemplateId(superAdmin.getTemplateId());
|
if (superAdmin != null) user.setTemplateId(superAdmin.getTemplateId());
|
||||||
}
|
}
|
||||||
if (userService.updateUser(user)) {
|
if (userService.updateUser(user)) {
|
||||||
return success("修改成功");
|
return success("修改成功");
|
||||||
|
|||||||
Reference in New Issue
Block a user