渠道规则开发5(关账数据导出)

yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml

@@ -225,9 +225,8 @@
                      LEFT JOIN ag_acl_insurer_branch_dept dept ON pra.dept_id = dept.id
                      LEFT JOIN ag_acl_insurer_branch_dept dept ON pra.dept_id = dept.id
                      LEFT JOIN ag_acl_practitioner_subordinate_system sub ON sub.id = pra.subordinate_system_id
                      LEFT JOIN ag_acl_practitioner_subordinate_system sub ON sub.id = pra.subordinate_system_id
                      LEFT JOIN ag_md_drop_options op
                      LEFT JOIN ag_md_drop_options op
-                     LEFT JOIN ag_md_drop_master mas ON mas.id = op.drop_master_id
+                     LEFT JOIN ag_md_drop_master mas ON mas.id = op.drop_master_id ON op.drop_option_code = f.commission_payout_status
         			 LEFT JOIN ag_acl_channel_new cha ON cha.id = f.channel_id
         			 LEFT JOIN ag_acl_channel_new cha ON cha.id = f.channel_id
-                ON op.drop_option_code = f.commission_payout_status
                 where (o.status = 3 or o.status = 4 or o.status is null)
                 where (o.status = 3 or o.status = 4 or o.status is null)
                   AND mas.drop_code like 'Commission_Payout_Status'
                   AND mas.drop_code like 'Commission_Payout_Status'
                   AND (f.order_price != 0 or f.order_price is null)
                   AND (f.order_price != 0 or f.order_price is null)