Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -750,11 +750,11 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         loanHomevisitInvestigateCustomerDto.setConSetUpKey(dto.getConSetUpKey());
         loanHomevisitInvestigateCustomerService.saveOrUpdateDto(loanHomevisitInvestigateCustomerDto);
         if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDto.getAccCompRegistNum())){
-            LoanHomevisitPrep loanHomevisitPrep = loanHomevisitPrepService.fetchBySid(loanHomevisitInvestigateCustomerDto.getMainSid());
-            if (loanHomevisitPrep != null && StringUtils.isNotBlank(loanHomevisitPrep.getSaleOrderSid())){
-                BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrep.getSaleOrderSid()).getData();
+            LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(loanHomevisitInvestigateCustomerDto.getMainSid());
+            if (loanHomevisitInvestigate != null && StringUtils.isNotBlank(loanHomevisitInvestigate.getSaleOrderSid())){
+                BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData();
                 FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(loanHomevisitInvestigateCustomerDto.getAccCompRegistNum(), busSalesOrder.getUseOrgSid()).getData();
-                if (finCompanyInvoicingDetailsVo == null || StringUtils.isBlank(finCompanyInvoicingDetailsVo.getTaxpayerNo())){
+                if (finCompanyInvoicingDetailsVo == null){
                     FinCompanyInvoicingDto finCompanyInvoicingDto = new FinCompanyInvoicingDto();
                     finCompanyInvoicingDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
                     finCompanyInvoicingDto.setName(loanHomevisitInvestigateCustomerDto.getAccCompName());