门店号管理

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();

src/main/resources/mapper/PrivilageDomainEntityDOMapper.xml

@@ -10,7 +10,7 @@
     </select>
 
     <select id="selectDomainIdByShopEntity" resultType="java.lang.Long">
-      select t1.org_id from  privilage_domain_entity t1,privilage_organizational_domain t2
+      select t2.org_id from  privilage_domain_entity t1,privilage_organizational_domain t2
         where t1.entity_id = #{shopId}
         and t1.domain_id = t2.domain_id
         and t1.type = 3