优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -1366,6 +1366,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             appDisAndCustm.setExtra(extra);
             appDisAndCustms.add(appDisAndCustm);
         }
+        if("01".equals(invoiceKey)){
             CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
             SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
             crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid());
@@ -1384,6 +1385,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
                 appDisAndCustm.setExtra(extra);
                 appDisAndCustms.add(appDisAndCustm);
             }
+        }
         return rb.success().setData(appDisAndCustms);
     }
 
@@ -1432,6 +1434,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             appDisAndCustm.setExtra(extra);
             appDisAndCustms.add(appDisAndCustm);
         }
+        if("01".equals(invoiceKey)){
             CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
             SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
             crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid());
@@ -1455,6 +1458,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
                 appDisAndCustm.setExtra(extra);
                 appDisAndCustms.add(appDisAndCustm);
             }
+        }
         return rb.success().setData(appDisAndCustms);
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@@ -163,7 +163,7 @@
             bo.`purchaseSystemSid`,
             bm.`modelName`,
             bm.`modelSid`,
-            if(bo.payTypeKey =1,bo.`oneBillMoney`,(select mainVehicleAmount from anrui_riskcenter.loan_solutions where salesOrderSid = bo.sid)) AS kpMoney
+            if(bo.payTypeKey =1,bo.`oneBillMoney`,(select mainVehicleAmount from anrui_riskcenter.loan_solutions where salesOrderSid = bo.sid)) AS invoiceMoney
         FROM anrui_buscenter.`bus_sales_order` bo
                 JOIN anrui_buscenter.`bus_sales_order_model` bm
                      ON bo.`sid` = bm.`salesOrderSid`