From ee0ba6d857316b58767b4f3a67a0204ed058a600 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Thu, 21 Dec 2023 17:46:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E6=9C=BA=E8=A1=A8=EF=BC=8C=E5=AE=8C=E6=88=90=E6=8A=95=E8=B5=84?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProfitDistributionController.java | 8 ++++++-- .../service/serviceImpl/ProfitManagementServiceImpl.java | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sztzjy/fund_investment/controller/ProfitDistributionController.java b/src/main/java/com/sztzjy/fund_investment/controller/ProfitDistributionController.java index beed75f..70c1963 100644 --- a/src/main/java/com/sztzjy/fund_investment/controller/ProfitDistributionController.java +++ b/src/main/java/com/sztzjy/fund_investment/controller/ProfitDistributionController.java @@ -1,6 +1,7 @@ package com.sztzjy.fund_investment.controller; import com.sztzjy.fund_investment.annotation.AnonymousAccess; +import com.sztzjy.fund_investment.entity.Fundraising; import com.sztzjy.fund_investment.entity.ProfitDistribution; import com.sztzjy.fund_investment.service.ISysFundraisingService; import com.sztzjy.fund_investment.service.ProfitDistributionService; @@ -42,8 +43,11 @@ public class ProfitDistributionController { @PostMapping("/getType") @ApiOperation("返回基金募集的类型") public Integer submit(@RequestParam String flowId) { - return fundraisingService.selectByFlowId(flowId).getType(); - + Fundraising fundraising = fundraisingService.selectByFlowId(flowId); + if (fundraising!=null) { + return fundraising.getType(); + } + return null; } } diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitManagementServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitManagementServiceImpl.java index 0db1ed8..76899a1 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitManagementServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitManagementServiceImpl.java @@ -99,6 +99,9 @@ public class ProfitManagementServiceImpl implements ProfitManagementService { } else { ExitTime exitTime = new ExitTime(); List profitManagementList = getLineChart(flowId); + if (profitManagementList.isEmpty()){ + return null; + } ProfitManagement profitManagement = profitManagementList.get(0); exitTime.setFlowId(flowId); exitTime.setProjectName(profitManagement.getProjectName());