diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java index 2a4e8f2a..799b19b9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -206,17 +206,22 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc //预约记录,默认正常 enterpriseLawEnforcement.setStatus(0); // enterpriseLawEnforcement.setIsSubmit(0); - EnterpriseMerchantAuthorization enterpriseMerchantAuthorization = - new EnterpriseMerchantAuthorization(); - //联系人手机号码 - enterpriseMerchantAuthorization.setMerchantTel(enterpriseLawEnforcement.getLinkTel()); - //查询企业信息 - List enterpriseMerchantAuthorizations = - enterpriseMerchantAuthorizationService.selectEnterpriseMerchantAuthorizationList(enterpriseMerchantAuthorization); - if (enterpriseMerchantAuthorizations.size() > 0) { - //设置企业的统一信用代码 - enterpriseLawEnforcement.setEnterpriseNumber( - enterpriseMerchantAuthorizations.get(0).getEnterpriseNumber()); + if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getEnterpriseNumber())) { + // 改为直接用企业编码 - 如果企业编码重复一样会出现问题(再登记的时候会查出不通企业, 不过问题不大) + enterpriseLawEnforcement.setEnterpriseNumber(enterpriseLawEnforcement.getEnterpriseNumber()); + } else { + EnterpriseMerchantAuthorization enterpriseMerchantAuthorization = + new EnterpriseMerchantAuthorization(); + // 联系人手机号码 - 通过联系人的话会出现问题, 比如一个联系人有多个企业, 只去第一个会导致数据错误 + enterpriseMerchantAuthorization.setMerchantTel(enterpriseLawEnforcement.getLinkTel()); + //查询企业信息 + List enterpriseMerchantAuthorizations = + enterpriseMerchantAuthorizationService.selectEnterpriseMerchantAuthorizationList(enterpriseMerchantAuthorization); + if (enterpriseMerchantAuthorizations.size() > 0) { + //设置企业的统一信用代码 + enterpriseLawEnforcement.setEnterpriseNumber( + enterpriseMerchantAuthorizations.get(0).getEnterpriseNumber()); + } } resNum = enterpriseLawEnforcementMapper.insertEnterpriseLawEnforcement(enterpriseLawEnforcement); }