diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index a6090ce902..6e53b75df6 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -289,12 +289,20 @@ public class ApiDefinitionExecResultService {
                             testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
                         } else if (StringUtils.equals(type, ApiRunMode.JENKINS_API_PLAN.name())) {
                             TestPlanApiCase apiCase = testPlanApiCaseService.getById(item.getName());
-                            userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
+//                            userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
+                            userID = SessionUtils.getUserId();
+                            if(userID == null){
+                                userID = "";
+                            }
                             apiCase.setStatus(status);
                             apiCase.setUpdateTime(System.currentTimeMillis());
                             testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
                         } else {
-                            userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
+                            userID = SessionUtils.getUserId();
+                            if(userID == null){
+                                userID = "";
+                            }
+//                            userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
                             testPlanApiCaseService.setExecResult(item.getName(), status, item.getStartTime());
                             testCaseReviewApiCaseService.setExecResult(item.getName(), status, item.getStartTime());
                         }
diff --git a/frontend/src/business/components/common/components/table/MsTable.vue b/frontend/src/business/components/common/components/table/MsTable.vue
index 31a8f82ea1..f80eaeb89a 100644
--- a/frontend/src/business/components/common/components/table/MsTable.vue
+++ b/frontend/src/business/components/common/components/table/MsTable.vue
@@ -22,6 +22,7 @@
                                       :page-size="pageSize > total ? total : pageSize"
                                       :table-data-count-in-page="data.length"
                                       :total="total"
+                                      :select-type="condition.selectAll"
                                       @selectPageAll="isSelectDataAll(false)"
                                       @selectAll="isSelectDataAll(true)"/>
 
diff --git a/frontend/src/business/components/common/components/table/MsTableColumn.vue b/frontend/src/business/components/common/components/table/MsTableColumn.vue
index e159c19b7c..76d0cdc9a0 100644
--- a/frontend/src/business/components/common/components/table/MsTableColumn.vue
+++ b/frontend/src/business/components/common/components/table/MsTableColumn.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-table-column
+  <el-table-column class-name="msTableColumn"
       v-if="!field || field.id === prop"
       :min-width="minWidth"
       :width="fieldsWidth ? fieldsWidth[prop] : width"
diff --git a/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
index 9ffdeabf5b..4e264bf812 100644
--- a/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
+++ b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
@@ -41,6 +41,7 @@
             return 10;
           }
         },
+        selectType: String,
         tableDataCountInPage: {
           type: Number,
           default() {
@@ -54,6 +55,11 @@
           }
         },
       },
+      watch:{
+        total(){
+          this.reload();
+        }
+      },
       created() {
         if(this.keyIndex === 0){
           this.keyIndex++;
@@ -93,6 +99,10 @@
           this.$emit(even);
         },
         reload() {
+            if(!this.selectType){
+              this.selectAllFontColor.color = "gray";
+              this.selectPageFontColor.color = "gray";
+            }
             this.isShow = false;
             this.$nextTick(() => {
               this.isShow = true;
diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 250987f80f..bf2f9d3a22 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -143,6 +143,9 @@ textarea {
   border-right: 0 !important;
 }
 
+.msTableColumn .el-tooltip {
+  width: auto !important;
+}
 /* 表格拖拽表头调整宽度 --> */
 
 /* <-- 表格 input 编辑效果 */