diff --git a/model/token.go b/model/token.go
index 66b8369..d13335e 100644
--- a/model/token.go
+++ b/model/token.go
@@ -34,7 +34,7 @@ func SearchUserTokens(userId int, keyword string, token string) (tokens []*Token
 	if token != "" {
 		token = strings.Trim(token, "sk-")
 	}
-	err = DB.Where("user_id = ?", userId).Where("name LIKE ?", keyword+"%").Where("`key` LIKE ?", token+"%").Find(&tokens).Error
+	err = DB.Where("user_id = ?", userId).Where("name LIKE ?", "%"+keyword+"%").Where("`key` LIKE ?", "%"+token+"%").Find(&tokens).Error
 	return tokens, err
 }
 
diff --git a/web/src/pages/Token/EditToken.js b/web/src/pages/Token/EditToken.js
index d38cd0c..7b33d68 100644
--- a/web/src/pages/Token/EditToken.js
+++ b/web/src/pages/Token/EditToken.js
@@ -123,8 +123,10 @@ const EditToken = (props) => {
             let successCount = 0; // 记录成功创建的令牌数量
             for (let i = 0; i < tokenCount; i++) {
                 let localInputs = {...inputs};
-                // 如果用户想要创建多个令牌，则给每个令牌一个序号后缀
-                localInputs.name = `${inputs.name}-${generateRandomSuffix()}`;
+                if (i !== 0) {
+                    // 如果用户想要创建多个令牌，则给每个令牌一个序号后缀
+                    localInputs.name = `${inputs.name}-${generateRandomSuffix()}`;
+                }
                 localInputs.remain_quota = parseInt(localInputs.remain_quota);
 
                 if (localInputs.expired_time !== -1) {