Merge remote-tracking branch 'origin/20210426_not_net' into dev

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

@@ -1559,7 +1559,7 @@ public class ProductServiceImpl implements ProductService, Constant {
     @Override
     public List<ProductInfoVO> getProductListNotNet(List<String> ids) {
         IfaImportedNonavFundExample example = new IfaImportedNonavFundExample();
-        example.createCriteria().andIdIn(ids);
+        example.createCriteria().andIdIn(ids).andDeleteTagEqualTo(0);
         List<IfaImportedNonavFund> ifaImportedNonavFunds = this.ifaImportedNonavFundMapper.selectByExample(example);
         if (CollUtil.isEmpty(ifaImportedNonavFunds)) {
             return new ArrayList<>(0);
@@ -1570,6 +1570,7 @@ public class ProductServiceImpl implements ProductService, Constant {
             vo.setProductType(4);
             vo.setFundName(ls.getFundName());
             vo.setProductName(ls.getFundName());
+            vo.setFundFile(ls.getFundFile());
             return vo;
         }).collect(Collectors.toList());
     }