From 441e717a096274af6bdb57f7908d61350872200c Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Wed, 29 Apr 2020 23:48:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=8F=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic/store/service/StoreEmployeeService.java | 13 +++++++++---- .../mapper/PrivilageDomainEntityDOMapper.xml | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) 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 @@