diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseMerchantAuthorizationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseMerchantAuthorizationServiceImpl.java index 1e8d528e..804d2dd1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseMerchantAuthorizationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseMerchantAuthorizationServiceImpl.java @@ -1,5 +1,6 @@ package com.zdxt.code.service.impl; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -63,8 +64,14 @@ public class EnterpriseMerchantAuthorizationServiceImpl implements IEnterpriseMe List enterpriseInformations = enterpriseInformationMapper.selectEnterpriseInformationList(enterpriseInformation); //list转Map - Map collect1 = - enterpriseInformations.stream().collect(Collectors.toMap(EnterpriseInformation::getEnterpriseNumber, Function.identity())); +// Map collect1 = +// enterpriseInformations.stream().collect(Collectors.toMap(EnterpriseInformation::getEnterpriseNumber, Function.identity())); + Map collect1 = new HashMap<>(); + for (EnterpriseInformation entity : enterpriseInformations) { + if (entity.getEnterpriseNumber() != null) { + collect1.put(entity.getEnterpriseNumber(), entity); + } + } //赋值企业名称 enterpriseMerchantAuthorizations.forEach(res ->{ EnterpriseInformation enterpriseInformation1 = collect1.get(res.getEnterpriseNumber());