202201：薪资单::经纪人信息显示调整

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

@@ -375,7 +375,7 @@
             if(f.fyc_amount is null,0,f.fyc_amount) fycAmount,
             if(f.fyc_amount is null,0,f.fyc_amount) fycAmount,
             if(f.grade_commission_rate is null,0,f.grade_commission_rate) gradeCommissionRate,
             if(f.grade_commission_rate is null,0,f.grade_commission_rate) gradeCommissionRate,
             (select s.name from ag_acl_practitioner_subordinate_system s where s.id = pra.subordinate_system_id) subordinateSystemName,
             (select s.name from ag_acl_practitioner_subordinate_system s where s.id = pra.subordinate_system_id) subordinateSystemName,
-            pra.name practitionerName,
+            if(f.sale_practitioner_id is not null,(	select name from ag_acl_practitioner a where a.id=sale_practitioner_id limit 1),(select name from ag_acl_practitioner a where a.customer_id = f.customer_id limit 1)) practitionerName,
             if(f.commission_rate is null,0,f.commission_rate) commissionRate,
             if(f.commission_rate is null,0,f.commission_rate) commissionRate,
             if(f.fyc_rate is null,0,f.fyc_rate) fycRate,
             if(f.fyc_rate is null,0,f.fyc_rate) fycRate,
             if(f.share_rate is null,100,f.share_rate) shareRate,
             if(f.share_rate is null,100,f.share_rate) shareRate,
@@ -392,8 +392,8 @@
                  left join ag_product p on p.id = o.product_id
                  left join ag_product p on p.id = o.product_id
                  left join ag_acl_insurer i on o.insurer_id = i.id
                  left join ag_acl_insurer i on o.insurer_id = i.id
                  left join ag_acl_customer_fortune_payout_batch pb on pb.id = f.payout_batch_id
                  left join ag_acl_customer_fortune_payout_batch pb on pb.id = f.payout_batch_id
-                 left join ag_acl_practitioner pra  on pra.customer_id = f.customer_id and f.sale_practitioner_id=pra.id
-                 left join ag_acl_life_insurance_practitioner lifepra on f.sale_practitioner_id=lifepra.practitioner_id and lifepra.order_id=o.id
+                 left join ag_acl_practitioner pra  on pra.customer_id = f.customer_id
+                 left join ag_acl_life_insurance_practitioner lifepra on pra.id=lifepra.practitioner_id and lifepra.order_id=o.id
                  inner join ag_acl_practitioner_setting setting on pra.id = setting.practitioner_id
                  inner join ag_acl_practitioner_setting setting on pra.id = setting.practitioner_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 on op.drop_option_code = f.commission_payout_status
                  left join ag_md_drop_master mas on mas.id = op.drop_master_id on op.drop_option_code = f.commission_payout_status