Merge remote-tracking branch 'origin/master' into dev

src/main/java/com/tanpu/fund/service/impl/ProductServiceImpl.java

@@ -1801,8 +1801,8 @@ public class ProductServiceImpl implements ProductService, Constant {
 
     @Override
     public CommonResp<List<FundNavMessage>> importNetCheckSave(IfaNetImportReq req) {
-        if (CollectionUtils.isEmpty(req.getFundNavMessages())) {
-            return CommonResp.success();
+        if (req.getFundNavMessages() == null) {
+            req.setFundNavMessages(new ArrayList<>());
         }
         Map<Long, IfaImportedFundNav> ifaNavMap;
         if (StringUtils.isEmpty(req.getFundId())) {
@@ -1811,7 +1811,7 @@ public class ProductServiceImpl implements ProductService, Constant {
             ifaNavMap = getIfaNavMap(req.getFundId());
         }
 
-        List<FundNavMessage> resultMessage = new ArrayList<>(req.getFundNavMessages().size() * 2);
+        List<FundNavMessage> resultMessage = new ArrayList<>(req.getFundNavMessages().size() * 2 + 1);
         AtomicBoolean errorStatus = new AtomicBoolean(false);
 
         req.setFundNavMessages(req.getFundNavMessages()