|
@@ -128,13 +128,15 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
|
|
|
|
|
|
wrapper.in("t2", SubscribeDetail::getCompanyId, SecurityUtils.getCompanyIds());
|
|
|
wrapper.eq("t2", SubscribeDetail::getCompanyId, dto.getCompanyId());
|
|
|
-
|
|
|
|
|
|
- String purchaseRange = sysUserService.getById(SecurityUtils.getUserId()).getPurchaseRange();
|
|
|
- if (ObjectUtil.isEmpty(purchaseRange)) {
|
|
|
- purchaseRange = "";
|
|
|
+
|
|
|
+ if (ObjectUtil.equals(dto.getIsWaitPurchase(), 1)) {
|
|
|
+ String purchaseRange = sysUserService.getById(SecurityUtils.getUserId()).getPurchaseRange();
|
|
|
+ if (ObjectUtil.isEmpty(purchaseRange)) {
|
|
|
+ purchaseRange = "";
|
|
|
+ }
|
|
|
+ wrapper.in("pi", ProductInfo::getProductClassifyId, purchaseRange.split(","));
|
|
|
}
|
|
|
- wrapper.in("pi", ProductInfo::getProductClassifyId, purchaseRange.split(","));
|
|
|
|
|
|
wrapper.orderByAsc("t2", SubscribeDetail::getCreateTime);
|
|
|
|