Merge remote-tracking branch 'origin/master'

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;
     }
 
 }

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<ProfitManagement> profitManagementList = getLineChart(flowId);
+            if (profitManagementList.isEmpty()){
+                return null;
+            }
             ProfitManagement profitManagement = profitManagementList.get(0);
             exitTime.setFlowId(flowId);
             exitTime.setProjectName(profitManagement.getProjectName());