fix: 缺失展示问题修复13526 缺失数据，穿石渝信壹号净值缺失应该是173条， 深国投-尚雅1期没有绘制出规模缺失

service-base/src/main/resources/mapper/DeletionInfoMapper.xml

@@ -62,9 +62,9 @@
         ddp.processed_num
         FROM
         PPW_EMAIL.deletion_info d
-        JOIN PPW_EMAIL.pvn_fund_info info
+        LEFT JOIN PPW_EMAIL.pvn_fund_info info
         ON d.fund_id = info.fund_id
-        JOIN PPW_EMAIL.pvn_company_info c
+        LEFT JOIN PPW_EMAIL.pvn_company_info c
         ON info.trust_id = c.company_id
         LEFT JOIN
         (SELECT
@@ -118,9 +118,9 @@
         select count(1) from (select distinct d.fund_id,d.deletion_type
         FROM
         PPW_EMAIL.deletion_info d
-        JOIN PPW_EMAIL.pvn_fund_info info
+        LEFT JOIN PPW_EMAIL.pvn_fund_info info
         ON d.fund_id = info.fund_id
-        JOIN PPW_EMAIL.pvn_company_info c
+        LEFT JOIN PPW_EMAIL.pvn_company_info c
         ON info.trust_id = c.company_id
         LEFT JOIN
         (SELECT
@@ -188,6 +188,7 @@
             parameterType="com.simuwang.base.pojo.dto.query.FundDeletionPageQuery">
         select id,fund_id,deletion_type,deletion_date,remark,isvalid,creatorid,updaterid,createtime,updatetime
         from PPW_EMAIL.deletion_info where isvalid=1 and fund_id=#{fundId} and deletion_type=#{deletionType}
+        order by deletion_date desc
         limit #{offset},#{pageSize}
     </select>
     <select id="countFundDeletionList" resultType="java.lang.Long"
@@ -205,6 +206,7 @@
         <if test="deletionType != null">
             and deletion_type=#{deletionType}
         </if>
+        order by fund_id desc,deletion_type desc ,deletion_date desc
     </select>
     <select id="getDeletionInfoDO" resultType="com.simuwang.base.pojo.dos.DeletionInfoDO"
             parameterType="com.simuwang.base.pojo.dos.DeletionInfoDO">

service-base/src/main/resources/mapper/EmailFundNavMapper.xml

@@ -147,7 +147,7 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
-        <if test="emailId != null">
+        <if test="emailId != null and emailId != ''">
             and parse.id=#{emailId}
         </if>
         ) a