diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java
index b52fdef..cdf54b5 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java
@@ -88,7 +88,15 @@ public class ForecastTaskController {
         if(StringUtils.isNotBlank(forecastTask.getOrderField())){
             wrapper.orderBy(true, ObjectUtils.isEmpty(forecastTask.getIsAsc()) ? false : forecastTask.getIsAsc(), forecastTask.getOrderField());
         }
-        return R.ok(service.list(wrapper));
+        List<ForecastTask> list = service.list(wrapper);
+        if (list.size() > 0) {
+            for (ForecastTask task : list) {
+                if (StringUtils.isNotEmpty(task.getUserId()) && task.getUserId().contains("_")) {
+                    task.setUserName(task.getUserId().substring(task.getUserId().indexOf("_") + 1));
+                }
+            }
+        }
+        return R.ok(list);
     }
 
     @Operation(summary = "分页")
@@ -103,10 +111,12 @@ public class ForecastTaskController {
         Page<ForecastTask> page = service.page(forecastTask.getPageSo().toPage(), wrapper);
         if (page.getRecords().size() > 0) {
             for (ForecastTask task : page.getRecords()) {
-                task.setUserName(task.getUserId().substring(task.getUserId().indexOf("_") + 1));
+                if (StringUtils.isNotEmpty(task.getUserId()) && task.getUserId().contains("_")) {
+                    task.setUserName(task.getUserId().substring(task.getUserId().indexOf("_") + 1));
+                }
             }
         }
-        return R.ok(service.page(forecastTask.getPageSo().toPage(), wrapper));
+        return R.ok(page);
     }
 
 }