Merge branch '20220922' into 'master'

refactor(DEFECT-756): 查询账号角色时，只返回启动的角色

See merge request huang/thingsboard3.3.2!136

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