From f863285523c49d86e8f989b71229dabcbdcee7dc Mon Sep 17 00:00:00 2001 From: cxw <1520264117@qq.com> Date: Thu, 14 Nov 2024 15:13:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E6=8A=A5=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ForecastProjectController.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java index 4172806..f69b10e 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java @@ -20,7 +20,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.Mapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -92,7 +91,15 @@ public class ForecastProjectController { if(StringUtils.isNotBlank(forecastProject.getOrderField())){ wrapper.orderBy(true, ObjectUtils.isEmpty(forecastProject.getIsAsc()) ? false : forecastProject.getIsAsc(), forecastProject.getOrderField()); } - return R.ok(service.list(wrapper)); + List list = service.list(wrapper); + if (list.size() > 0) { + for (ForecastProject fp : list) { + if (StringUtils.isNotEmpty(fp.getUserId()) && fp.getUserId().contains("_")) { + fp.setUserId(fp.getUserId().substring(fp.getUserId().indexOf("_") + 1)); + } + } + } + return R.ok(list); } @Operation(summary = "分页") @@ -106,7 +113,15 @@ public class ForecastProjectController { if(StringUtils.isNotBlank(forecastProject.getOrderField())){ wrapper.orderBy(true, ObjectUtils.isEmpty(forecastProject.getIsAsc()) ? false : forecastProject.getIsAsc(), forecastProject.getOrderField()); } - return R.ok(service.page(forecastProject.getPageSo().toPage(), wrapper)); + Page page = service.page(forecastProject.getPageSo().toPage(), wrapper); + if (page.getRecords().size() > 0) { + for (ForecastProject fp : page.getRecords()) { + if (StringUtils.isNotEmpty(fp.getUserId()) && fp.getUserId().contains("_")) { + fp.setUserId(fp.getUserId().substring(fp.getUserId().indexOf("_") + 1)); + } + } + } + return R.ok(page); }