|
@@ -36,6 +36,7 @@ import com.ruoyi.common.exception.ServiceException;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
import com.ruoyi.system.service.ISysDeptService;
|
|
|
+import com.ruoyi.system.service.ISysUserService;
|
|
|
import com.ruoyi.system.utils.UserUtil;
|
|
|
import org.apache.commons.collections4.MapUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -73,6 +74,8 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
|
|
|
private ISysDeptService deptService;
|
|
|
@Autowired
|
|
|
private ProductClassifyService productClassifyService;
|
|
|
+ @Autowired
|
|
|
+ private ISysUserService sysUserService;
|
|
|
|
|
|
/**
|
|
|
* 分页
|
|
@@ -126,7 +129,8 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
|
|
|
wrapper.in("t2", SubscribeDetail::getCompanyId, SecurityUtils.getCompanyIds());
|
|
|
wrapper.eq("t2", SubscribeDetail::getCompanyId, dto.getCompanyId());
|
|
|
//根据业务员采购范围过滤
|
|
|
- String purchaseRange = SecurityUtils.getLoginUser().getUser().getPurchaseRange();
|
|
|
+
|
|
|
+ String purchaseRange = sysUserService.getById(SecurityUtils.getUserId()).getPurchaseRange();
|
|
|
if (ObjectUtil.isEmpty(purchaseRange)) {
|
|
|
purchaseRange = "";
|
|
|
}
|