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