diff --git a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java index 401fbbb..81ba447 100644 --- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java +++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java @@ -9,6 +9,7 @@ import com.kiisoo.ic.customer.mapper.OpCustomerDOMapper; import com.kiisoo.ic.customer.mapper.OpVipDOMapper; import com.kiisoo.ic.domain.service.PrivilageDomainService; import com.kiisoo.ic.generalize.entity.PoiCustomerContactDataStat; +import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; import com.kiisoo.ic.generalize.mapper.PoiCustomerContactDataStatMapper; import com.kiisoo.ic.generalize.service.RetailCompanyService; import com.kiisoo.ic.store.entity.PoiStore; @@ -354,4 +355,5 @@ public class CustomerViewService { shopIds.retainAll(userAllShops); return shopIds; } + } diff --git a/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java b/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java index 683eeac..489a5b9 100644 --- a/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java +++ b/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java @@ -36,6 +36,26 @@ public class RetailCompanyController extends BaseController { this.retailCompanyService = retailCompanyService; } + /** + * 查询用户零售公司 + * @param companyId 父区域id + * @param userId 用户id + * @param level 区域等级 + * @return + */ + + @ResponseBody + @GetMapping("/user/company") + public Map getUserOrg(Long companyId,@RequestParam("userId") long userId,@RequestParam("level") int level){ + try{ + List privilageOrganizationals = retailCompanyService.getUserOrg(companyId,userId,level); + return data(privilageOrganizationals); + }catch (Exception e){ + log.error("查询用户零售公司",e); + return fail(); + } + } + /** * 查询所有的零售公司数据 * @return 零售公司数据集合 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 b42db75..5764330 100644 --- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java +++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java @@ -65,6 +65,34 @@ public class RetailCompanyService { this.poiStoreStaffDOMapper = poiStoreStaffDOMapper; } + + /** + * 找到用户公司 + * @param companyId 父区域id + * @param userId 用户id + * @param level 等级 + * @return + */ + public List getUserOrg(Long companyId, long userId, int level){ + + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.eq("user_id",userId); + PrivilageOrganizational p = new PrivilageOrganizational(); + List pm = organizationalMemberMapper.selectList(wrapper1); + QueryWrapper wrapper = new QueryWrapper<>(); + if(pm.isEmpty()) { + return null; + }else { + wrapper.eq("type", 1).eq("status", 1).eq("level",level). + in("id", pm.stream().map(PrivilageOrganizationalMember::getOrgId). + collect(Collectors.toList())); + if(null != companyId){ + wrapper.eq("parent_id",companyId); + } + return retailCompanyMapper.selectList(wrapper); + } + } + /** * 查询所有的零售公司信息 */