Follow @wxiaoguang's suggestion

Author: lunny

models/issues/issue.go

@@ -10,7 +10,6 @@ import (
 	"html/template"
 	"regexp"
 	"slices"
-	"strconv"
 
 	"code.gitea.io/gitea/models/db"
 	project_model "code.gitea.io/gitea/models/project"
@@ -520,13 +519,12 @@ func FindLatestIssues(ctx context.Context, repoID int64, isPull optional.Option[
 	return issues, err
 }
 
-func FindIssuesSuggestionByKeyword(ctx context.Context, repoID int64, keyword string, isPull optional.Option[bool], pageSize int) (IssueList, error) {
-	indexKeyword, _ := strconv.ParseInt(keyword, 10, 64)
+func FindIssuesSuggestionByKeyword(ctx context.Context, repoID int64, keyword string, isPull optional.Option[bool], nonID int64, pageSize int) (IssueList, error) {
 	cond := builder.NewCond()
-	if indexKeyword > 0 {
-		cond = cond.Or(builder.Eq{"`index`": indexKeyword})
+	if nonID > 0 {
+		cond = cond.And(builder.Neq{"`id`": nonID})
 	}
-	cond = cond.Or(builder.Expr("name LIKE ?", "%"+keyword+"%"))
+	cond = cond.And(builder.Expr("name LIKE ?", "%"+keyword+"%"))
 
 	issues := make([]*Issue, 0, pageSize)
 	err := db.GetEngine(ctx).Where("repo_id = ?", repoID).

services/issue/suggestion.go

@@ -5,7 +5,6 @@ package issue
 
 import (
 	"context"
-	"sort"
 	"strconv"
 
 	issues_model "code.gitea.io/gitea/models/issues"
@@ -24,21 +23,27 @@ func GetSuggestion(ctx context.Context, repo *repo_model.Repository, isPull opti
 			return nil, err
 		}
 	} else {
-		issues, err = issues_model.FindIssuesSuggestionByKeyword(ctx, repo.ID, keyword, isPull, pageSize)
+		indexKeyword, _ := strconv.ParseInt(keyword, 10, 64)
+		var issue *issues_model.Issue
+		var nonID int64
+		if indexKeyword > 0 {
+			issue, err = issues_model.GetIssueByIndex(ctx, repo.ID, indexKeyword)
+			if err != nil && !issues_model.IsErrIssueNotExist(err) {
+				return nil, err
+			}
+			if issue != nil {
+				nonID = issue.ID
+				pageSize--
+			}
+		}
+
+		issues, err = issues_model.FindIssuesSuggestionByKeyword(ctx, repo.ID, keyword, isPull, nonID, pageSize)
 		if err != nil {
 			return nil, err
 		}
-		indexKeyword, _ := strconv.ParseInt(keyword, 10, 64)
-		if indexKeyword > 0 {
-			sort.Slice(issues, func(i, j int) bool {
-				if issues[i].Index == indexKeyword {
-					return true
-				}
-				if issues[j].Index == indexKeyword {
-					return false
-				}
-				return issues[i].Index > issues[j].Index
-			})
+
+		if issue != nil {
+			issues = append([]*issues_model.Issue{issue}, issues...)
 		}
 	}