Merge remote-tracking branch 'origin/master'

2025-03-27 10:53:31 +08:00
parent 78728ff706 c00a6cc36c
commit a57d8297af
1 changed files with 1 additions and 1 deletions
--- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
@@ -208,7 +208,7 @@ public class UserController extends BaseController {
        // 同步管理员的产品套餐ID
        if(user.getIsAdmin() != null){
          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)) {
            return success("修改成功");