缺失问题优化

service-base/src/main/resources/mapper/daq/FundNavAssetMapper.xml

@@ -93,7 +93,7 @@
         LEFT JOIN asset asset
         ON nav.fund_id = asset.fund_id
         AND nav.price_date = asset.price_date
-        AND asset.isvalid = 1
+        AND asset.isvalid = 1 and nav.channel_id = asset.channel_id
         join channel_info c on c.id = nav.channel_id and c.isvalid=1
         <if test="userId != null and userId !=''">
             join user_channel_mapping ucm

service-manage/src/main/java/com/simuwang/manage/service/impl/DeletionServiceImpl.java

@@ -238,7 +238,7 @@ public class DeletionServiceImpl implements DeletionService {
             try{
                 String fundId = fundDeletionType.getFundId();
                 Integer deletionType = fundDeletionType.getDeletionType();
-                Integer channelId = fundDeletionType.getDeletionType();
+                Integer channelId = fundDeletionType.getChannelId();
                 Integer deletionNum = deletionInfoMapper.countChannelFundDeletion(fundId, deletionType, channelId, 1);
                 Integer processedNum = deletionInfoMapper.countChannelFundDeletion(fundId, deletionType, channelId, 0);
                 if(deletionNum == 0 && processedNum == 0){