From 368fb4eef4f548086f5a7072274caafd4eed4d30 Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Thu, 23 Apr 2020 16:45:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9B=9E=E8=B0=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kiisoo/ic/generalize/service/RetailCompanyService.java    | 4 ++--
 .../ic/system/service/impl/PrivilageAccountServiceImpl.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
index 62c0e04..88db4e2 100644
--- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
+++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
@@ -104,7 +104,7 @@ public class RetailCompanyService {
         if(pm.isEmpty()) {
             return null;
         }else {
-            wrapper.eq("type", 1).eq("status", 1).in("id", pm.stream().map(PrivilageOrganizationalMember::getOrgId).collect(Collectors.toList()));
+            wrapper.eq("type", 1).eq("status", 1).eq("level",2).in("id", pm.stream().map(PrivilageOrganizationalMember::getOrgId).collect(Collectors.toList()));
             return retailCompanyMapper.selectList(wrapper);
         }
     }
@@ -391,7 +391,7 @@ public class RetailCompanyService {
             sellerOrganizationalVO.setShopCode(companyStoreDO == null ? null : companyStoreDO.getShopCode());
             sellerOrganizationalVO.setSellerCode(poiStoreStaff == null ? null : poiStoreStaff.getStaffCode());
             sellerOrganizationalVO.setCompanyName(companyStoreDO == null ? null : companyStoreDO.getCompanyName());
-            sellerOrganizationalVO.setSellerName(privilageUserDO.getName());
+            sellerOrganizationalVO.setSellerName(privilageUserDO == null ? null :privilageUserDO.getName());
             sellerOrganizationalVO.setAllCustomer((int) count);
             list.add(sellerOrganizationalVO);
         });
diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
index e6a10e6..d5bf557 100644
--- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
@@ -282,7 +282,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
                 if (shopNameByUserId != null) {
                     PoiStore poiStore = poiStoreDOMapper.selectById(shopNameByUserId.getStoreId());
                     accountBean.setShopId(shopNameByUserId.getStoreId());
-                    accountBean.setShopName(poiStore.getName());
+                    accountBean.setShopName(poiStore == null ? null : poiStore.getName());
                     accountBean.setStaffCode(shopNameByUserId.getStaffCode());
                 }
             }