Merge branch 'master' of git.yuntengiot.com:huang/thingsboard3.3.2

@@ -580,7 +580,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       if(enableRoles.size() == 0){
         return null;
       }
-      return roleIds.toArray(new String[enableRoles.size()]);
+      return enableRoles.toArray(new String[enableRoles.size()]);
     }
     if (roleOrGroupReqDTO.isQueryOrganization()) {
       List<String> organizationIds =