diff --git a/src/main/java/com/kiisoo/ic/store/controller/PoiStoreStaffController.java b/src/main/java/com/kiisoo/ic/store/controller/PoiStoreStaffController.java index 028215a..26035b5 100644 --- a/src/main/java/com/kiisoo/ic/store/controller/PoiStoreStaffController.java +++ b/src/main/java/com/kiisoo/ic/store/controller/PoiStoreStaffController.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; import java.util.Map; /** @@ -29,9 +30,9 @@ public class PoiStoreStaffController extends BaseController { */ @ResponseBody @PostMapping("/user/seller") - public Map getSellerData(@RequestParam("userId")long userId, Long shopId, Long regionId, Long companyId){ + public Map getSellerData(@RequestParam("userId")long userId, Long shopId, Long regionId, Long companyId, List customers){ try { - return data(poiSellerService.getAllSeller(regionId, shopId, userId, companyId)); + return data(poiSellerService.getAllSeller(regionId, shopId, userId, companyId, customers)); }catch (Exception e){ log.error("查找用户管辖的导购",e); return fail(); diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java b/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java index 26ed73e..a6b15c6 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiSellerService.java @@ -44,7 +44,7 @@ public class PoiSellerService { /** * 找到区域或者店铺中所有的导购 */ - public List getAllSeller(Long regionId, Long shopId, long userId, Long companyId){ + public List getAllSeller(Long regionId, Long shopId, long userId, Long companyId, List customers){ List shopIds = new ArrayList<>(); //先找到店铺 if(null != shopId){ @@ -59,7 +59,13 @@ public class PoiSellerService { }else if(companyId != null){ //有公司就查公司店铺 shopIds.addAll(customerViewService.getCompanyShop(companyId,userId)); - }else{ + }else if(customers != null){ + for(Long cp : customers){ + //有公司就查公司店铺 + shopIds.addAll(customerViewService.getCompanyShop(cp,userId)); + } + + }else { //什么都没有就全查 shopIds = privilageDomainService.listUserDatePermission(userId); } diff --git a/src/main/resources/mapper/OpCustomerDOMapper.xml b/src/main/resources/mapper/OpCustomerDOMapper.xml index 7f126c3..9cabed1 100644 --- a/src/main/resources/mapper/OpCustomerDOMapper.xml +++ b/src/main/resources/mapper/OpCustomerDOMapper.xml @@ -30,12 +30,12 @@ and t1.create_time #{endDate} - order by t2.id,t1.user_id asc + order by t2.id,t1.user_id, t1.create_time desc