From 20372c8fed14bf4b0e23d8b7dce8af2546c48993 Mon Sep 17 00:00:00 2001 From: cxw <1520264117@qq.com> Date: Fri, 25 Oct 2024 14:30:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=AA=E6=B0=B4=E4=BB=BB=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/ForecastTaskController.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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 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 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); } }