diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index 57c782c..487071a 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -155,11 +155,16 @@ public class StoreEmployeeService { //客户orgId Long customerId = privilageDomainEntityDOMapper.selectDomainIdByShopEntity(cpUserStore.getId()); - PrivilageOrganizational company = retailCompanyMapper.selectById(customerId); - PrivilageOrganizational region = retailCompanyMapper.selectById(company.getParentId()); + if (customerId != null){ + PrivilageOrganizational customer = retailCompanyMapper.selectById(customerId); + PrivilageOrganizational company = retailCompanyMapper.selectById(customer.getParentId()); + PrivilageOrganizational region = retailCompanyMapper.selectById(company.getParentId()); + + cpUserStore.setCompanyName(company.getName()); + cpUserStore.setRegionName(region.getName()); + } + - cpUserStore.setCompanyName(company.getName()); - cpUserStore.setRegionName(region.getName()); String qrCodeAction = cpUserStore.getQrCodeAction(); diff --git a/src/main/resources/mapper/PrivilageDomainEntityDOMapper.xml b/src/main/resources/mapper/PrivilageDomainEntityDOMapper.xml index 2eb45f7..494a674 100644 --- a/src/main/resources/mapper/PrivilageDomainEntityDOMapper.xml +++ b/src/main/resources/mapper/PrivilageDomainEntityDOMapper.xml @@ -10,7 +10,7 @@