diff --git a/application/src/main/java/run/halo/app/theme/finders/CommentFinder.java b/application/src/main/java/run/halo/app/theme/finders/CommentFinder.java
index a8cb0a210..88a22a34b 100644
--- a/application/src/main/java/run/halo/app/theme/finders/CommentFinder.java
+++ b/application/src/main/java/run/halo/app/theme/finders/CommentFinder.java
@@ -1,10 +1,10 @@
 package run.halo.app.theme.finders;
 
+import java.util.Map;
 import org.springframework.lang.Nullable;
 import reactor.core.publisher.Mono;
 import run.halo.app.core.extension.content.Comment;
 import run.halo.app.extension.ListResult;
-import run.halo.app.extension.Ref;
 import run.halo.app.theme.finders.vo.CommentVo;
 import run.halo.app.theme.finders.vo.ReplyVo;
 
@@ -18,7 +18,7 @@ public interface CommentFinder {
 
     Mono<CommentVo> getByName(String name);
 
-    Mono<ListResult<CommentVo>> list(@Nullable Ref ref, @Nullable Integer page,
+    Mono<ListResult<CommentVo>> list(@Nullable Map<String, String> ref, @Nullable Integer page,
         @Nullable Integer size);
 
     Mono<ListResult<ReplyVo>> listReply(String commentName, @Nullable Integer page,
diff --git a/application/src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java
index 184537a81..08c6e4c53 100644
--- a/application/src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java
+++ b/application/src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java
@@ -1,5 +1,6 @@
 package run.halo.app.theme.finders.impl;
 
+import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import reactor.core.publisher.Mono;
 import run.halo.app.extension.ListResult;
@@ -28,7 +29,15 @@ public class CommentFinderImpl implements CommentFinder {
     }
 
     @Override
-    public Mono<ListResult<CommentVo>> list(Ref ref, Integer page, Integer size) {
+    public Mono<ListResult<CommentVo>> list(Map<String, String> map, Integer page, Integer size) {
+        if (map == null) {
+            return commentPublicQueryService.list(null, page, size);
+        }
+        Ref ref = new Ref();
+        ref.setGroup(map.get("group"));
+        ref.setVersion(map.get("version"));
+        ref.setKind(map.get("kind"));
+        ref.setName(map.get("name"));
         return commentPublicQueryService.list(ref, page, size);
     }