Merge branch 'refs/heads/v26.5_optimize_20240918' into release

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOrderChildRiskServiceImpl.java

@@ -97,8 +97,6 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
             settlementDriverDetailDao.updateConvertOrdinary(settlementDriverDetail);
 
             settlementOrderChildRisk.setInvoiceType(settlementOwnerDetail.getInvoiceType());
-        }
-        else {
 
             if (settlementDriver != null) {
                 settlementDriver.setInvoiceType(settlementOwnerDetail.getInvoiceType());
@@ -107,6 +105,10 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
                 settlementDriver.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());
                 settlementDriverDao.updateInvoiceCompany(settlementDriver);
             }
+        }
+        else {
+
+
         }
 
         settlementOrderChildRiskDao.updateProcess(settlementOrderChildRisk);