fix

src/main/java/com/quantgroup/asset/distribution/service/route/impl/ChannelRouteServiceImpl.java

@@ -142,7 +142,7 @@ public class ChannelRouteServiceImpl implements IChannelRouteService {
         List<FundProductEntity> fundProductEntityList = fundProductRepository.getAllByEnableEquals(Byte.valueOf("1"));
         List<Long> fundIdList = new ArrayList<>();
         fundProductEntityList.stream().forEach(fundProductEntity -> {
-            if (!fundIdList.contains(fundProductEntity.getFundId())){
+            if (!fundIdList.contains(fundProductEntity.getFundId()) && !StringUtils.isEmpty(fundProductEntity.getBasicRule())){
                 fundIdList.add(fundProductEntity.getFundId());
             }
         });

src/main/java/com/quantgroup/asset/distribution/service/route/impl/FundProductServiceImpl.java

@@ -301,7 +301,7 @@ public class FundProductServiceImpl implements IFundProductService {
                                 basicRule.append(" || ");
                             }
                         }
-                        basicRule.append(")");
+                        basicRule.append(")").append(" && ");
 
                         //basicRule.append("term == ").append(value).append(" && ");
                         break;