diff --git a/docs/changelog.md b/docs/changelog.md
index c2ef3ef5..c5888e9d 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -12,6 +12,7 @@
 - 修正自动提取关键词功能；
 - 修正开启绝对链接文档正文上传图片问题；
 - 编辑页面关键词可选择自动生成；
+- 修正图集提取第一个图片为缩略图的问题；
 - 其他常规问题修复；
 
 # V6.5.8
diff --git a/src/admin/album_add.php b/src/admin/album_add.php
index 568ed63d..c4abb7a6 100644
--- a/src/admin/album_add.php
+++ b/src/admin/album_add.php
@@ -45,7 +45,6 @@ if ($dopost != 'save') {
     if (!isset($remote)) $remote = 0;
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
-    if (!isset($ddisfirst)) $ddisfirst = 0;
     if (!isset($albums)) $albums = '';
     if (!isset($delzip)) $delzip = 0;
     if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click);
@@ -132,7 +131,7 @@ if ($dopost != 'save') {
                 $info = '';
                 $imginfos = GetImageSize($cfg_basedir.$v, $info);
             }
-            if ($ddisfirst == 1) {
+            if ($autolitpic == 1 && empty($litpic)) {
                 $litpic = $v;
             }
             $imginfo =  !empty($album['txt']) ? $album['txt'] : '';
diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php
index 94274cb8..04dbf1e0 100644
--- a/src/admin/album_edit.php
+++ b/src/admin/album_edit.php
@@ -116,13 +116,7 @@ if ($dopost != 'save') {
     }
     //跳转网址的文档强制为动态
     if (preg_match("#j#", $flag)) $ismake = -1;
-    //更新数据库的SQL语句
-    $query = "
-    UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',source='$source',writer='$writer',litpic='$litpic',pubdate='$pubdate',senddate='$senddate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid' WHERE id='$id'; ";
-    if (!$dsql->ExecuteNoneQuery($query)) {
-        ShowMsg("数据保存到数据库文档主表出错，请检查数据库字段".$dsql->GetError(), "javascript:;");
-        exit();
-    }
+
     $imgurls = "{dede:pagestyle maxwidth='$maxwidth' pagepicnum='$pagepicnum' ddmaxwidth='$ddmaxwidth' row='$row' col='$col' value='$pagestyle'/}\r\n";
     $hasone = false;
     //检查旧的图片是否有更新，并保存
@@ -164,6 +158,9 @@ if ($dopost != 'save') {
                 $litpicname = $ddurl;
             }
             $imgurls .= "{dede:img ddimg='$litpicname' text='$iinfo' width='".$imginfos[0]."' height='".$imginfos[1]."'} $iurl {/dede:img}\r\n";
+            if ($autolitpic == 1 && empty($litpic)) {
+                $litpic = $litpicname;
+            }
         }
         //没上传图片，只修改msg信息
         else {
@@ -175,8 +172,18 @@ if ($dopost != 'save') {
             }
             $imginfos = @GetImageSize($imgfile, $info);
             $imgurls .= "{dede:img ddimg='$ddurl' text='$iinfo' width='".$imginfos[0]."' height='".$imginfos[1]."'} $iurl {/dede:img}\r\n";
+            if ($autolitpic == 1 && empty($litpic)) {
+                $litpic = $ddurl;
+            }
         }
     }
+    //更新数据库的SQL语句
+    $query = "
+    UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',source='$source',writer='$writer',litpic='$litpic',pubdate='$pubdate',senddate='$senddate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid' WHERE id='$id'; ";
+    if (!$dsql->ExecuteNoneQuery($query)) {
+        ShowMsg("数据保存到数据库文档主表出错，请检查数据库字段".$dsql->GetError(), "javascript:;");
+        exit();
+    }
     if ($albums !== "") {
         $albumsArr  = json_decode(stripslashes($albums), true);
         for ($i = 0; $i <= count($albumsArr) - 1; $i++) {
diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm
index 9d1c2cd9..a52b5be5 100644
--- a/src/admin/templets/index_body.htm
+++ b/src/admin/templets/index_body.htm
@@ -177,7 +177,7 @@
 								<button id="btnGoStep4" type="button" class="btn btn-success btn-sm">下载</button>
 							</div>
 							<div id="btnStep5" class="btnStep">
-								<div class="form-check form-check-inline">
+								<div class="form-check form-check-inline" style="vertical-align: middle">
 									<input class="form-check-input" type="checkbox" id="chkUpdate" name="chkUpdate" value="true">
 									<label class="form-check-label" for="chkUpdate">自动检查更新</label>
 								</div>