Merge branch '20220831' into 'master'

fix: 租户角色不存在，会留存脏数据

See merge request huang/thingsboard3.3.2!126

@@ -186,6 +186,8 @@ public class YtUserController extends AbstractUserAccount {
     }
     }
     userService.validateUserNameAndPhoneNumberAndEmail(userDTO);
     userService.validateUserNameAndPhoneNumberAndEmail(userDTO);
     TenantId tenantId = TenantId.fromUUID(UUID.fromString(userDTO.getTenantId()));
     TenantId tenantId = TenantId.fromUUID(UUID.fromString(userDTO.getTenantId()));
+    UserDTO returnUser = userService.saveTenantAdmin(
+            userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
     try {
     try {
       // 创建TB的租户管理员
       // 创建TB的租户管理员
       CustomerId customerId = new CustomerId(EntityId.NULL_UUID);
       CustomerId customerId = new CustomerId(EntityId.NULL_UUID);
@@ -200,8 +202,7 @@ public class YtUserController extends AbstractUserAccount {
       throw handleException(e);
       throw handleException(e);
     }
     }
 
 
-    return userService.saveTenantAdmin(
-        userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
+    return returnUser;
   }
   }
 
 
   @DeleteMapping
   @DeleteMapping