Merge branch 'develop'

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTax/controller/BizFinancialIndividualIncomeTaxDetailController.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.finance.IndividualIncomeTax.controller;
 
 import cn.ezhizao.common.utils.SecurityUtils;
+import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.common.utils.poi.ExcelUtil;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
@@ -125,14 +126,16 @@ public class BizFinancialIndividualIncomeTaxDetailController extends BaseControl
         List<SysFileStorage> files = bizFinancialIndividualIncomeTaxDetailService.getFiles(biz.getId());
         if (CollectionUtils.isEmpty(files)){
             ArrayList<SysFileStorage> objects = new ArrayList<>();
-            SysFileStorage sysFileStorage = new SysFileStorage();
-            sysFileStorage.setFileUrl(biz.getReportFile());
-            String[] parts = splitFileName(biz.getReportFile());
-            sysFileStorage.setFileName(parts[0]);
-            sysFileStorage.setOriginalFileName(parts[1]);
-            objects.add(sysFileStorage);
-            biz.setReportFiles(objects);
-            return success(biz);
+            if (StringUtils.isNotEmpty(biz.getReportFile()) ){
+                SysFileStorage sysFileStorage = new SysFileStorage();
+                sysFileStorage.setFileUrl(biz.getReportFile());
+                String[] parts = splitFileName(biz.getReportFile());
+                sysFileStorage.setFileName(parts[0]);
+                sysFileStorage.setOriginalFileName(parts[1]);
+                objects.add(sysFileStorage);
+                biz.setReportFiles(objects);
+                return success(biz);
+            }
         }
         biz.setReportFiles(bizFinancialIndividualIncomeTaxDetailService.getFiles(biz.getId()));
         return success(biz);