diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java
index a65efa9a..70c91bf0 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java
@@ -101,6 +101,9 @@ public class PhpOnlineStudyRecordScheduledTasks {
             // 获取ES中的数据
             List<CourseStudyDto> esDataList = getEsData(batch);
 
+            if (CollUtil.isEmpty(esDataList)){
+                continue;
+            }
 
             // 更新ES数据
             List<CourseStudyDto> toBeUpdatedEs = esDataList.stream()
@@ -136,6 +139,7 @@ public class PhpOnlineStudyRecordScheduledTasks {
     }
 
     private List<CourseStudyDto> getEsData(List<PhpOnlineDto> finishedCourseList) throws IOException {
+        log.info("待处理的数据：{}", finishedCourseList);
         SearchRequest searchRequest = new SearchRequest("new_study_resource");
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
 
@@ -151,11 +155,13 @@ public class PhpOnlineStudyRecordScheduledTasks {
             );
         }
 
-        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().query(boolQuery).timeout(new TimeValue(60, TimeUnit.SECONDS));
-        searchRequest.source(sourceBuilder);
         if (boolQuery.hasClauses()) {
-            sourceBuilder.query(boolQuery);
+            return null;
         }
+        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder()
+                .query(boolQuery)
+                .timeout(new TimeValue(60, TimeUnit.SECONDS))
+                .size(finishedCourseList.size() + 10);
         searchRequest.source(sourceBuilder);
 
         SearchResponse response = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT);
diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/PhpOnlineCourseDao.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/PhpOnlineCourseDao.java
index 67e05d59..b81468f1 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/PhpOnlineCourseDao.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/PhpOnlineCourseDao.java
@@ -95,20 +95,20 @@ public class PhpOnlineCourseDao extends BaseDao<PhpOnlineDto> {
             userBasicDataBase = "userbasic";
         }
 
-        List<String> userIds = objectList1.stream().map(objects -> String.valueOf(objects[1])).distinct().collect(Collectors.toList());
-        List<Object[]> objectList2 = this.sqlFindList("select kid,user_id from " + userBasicDataBase + ".user_account where kid in (?1) and deleted=0 and account_status = 0", userIds);
+        List<String> userIdOfPhpList = objectList1.stream().map(objects -> String.valueOf(objects[1])).distinct().collect(Collectors.toList());
+        List<Object[]> objectList2 = this.sqlFindList("select kid,user_id from " + userBasicDataBase + ".user_account where kid in (?1) and deleted=0 and account_status = 0", userIdOfPhpList);
 
         if (CollUtil.isEmpty(objectList1)) {
             log.info("新系统用户数据不存在");
             return null;
         }
 
-        Map<Object, Object> userIdToKidMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1]));
+        Map<Object, Object> kidAndUserIdMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1]));
 
         // 设置新系统用户ID
         recentLearnRecordList = recentLearnRecordList.stream()
                 .map(phpOnlineDto -> {
-                    Object userIdOfJavaObj = userIdToKidMap.get(phpOnlineDto.getUserIdOfPhp());
+                    Object userIdOfJavaObj = kidAndUserIdMap.get(phpOnlineDto.getUserIdOfPhp());
                     if (userIdOfJavaObj != null) {
                         phpOnlineDto.setUserIdOfJava(userIdOfJavaObj.toString());
                     }