diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java index d444d71f23..7f576b943d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.basedistributor.*; import com.yxt.anrui.base.api.basedistributor.app.*; import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman; +import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecord; import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -138,4 +139,6 @@ public interface BaseDistributorMapper extends BaseMapper { List selectAppAllDisList(@Param("sid") String sid, @Param("search") String search); int updateFlowFiled(Map map); + + LoanCustomerRecord selectByRecord(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index b6c4ef14eb..c4610ec6ab 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -295,4 +295,8 @@ AND createOrg = #{sid} AND disName LIKE concat('%', #{search}, '%') + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index b96888987f..32f46c634c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -48,6 +48,7 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.UserRoleQuery; +import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecord; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.LoanFinPolicyRecordApply; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; @@ -1431,6 +1432,11 @@ public class BaseDistributorService extends MybatisBaseService crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData(); for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) { AppDisAndCustm appDisAndCustm = new AppDisAndCustm(); + //查询是否已备案 + LoanCustomerRecord loanCustomerRecord = baseMapper.selectByRecord(crmCustomerTempListVo.getSid()); + if(loanCustomerRecord == null){ + continue; + } Extra extra = new Extra(); appDisAndCustm.setDictValue(crmCustomerTempListVo.getName()); appDisAndCustm.setId(crmCustomerTempListVo.getSid()); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index 6cff4366f6..41463f199d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -503,7 +503,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService qyAppFetchDetailsBySid(String sid) { ResultBean rb = ResultBean.fireFail(); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = fetchDetailsVoBySid(sid); - if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getSid())) { + if (finCompanyInvoicingDetailsVo != null && StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getSid())) { return rb.success().setData(finCompanyInvoicingDetailsVo); } CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(sid).getData(); @@ -517,6 +517,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService