|
|
@@ -15,6 +15,9 @@ import com.fs.common.utils.ParseUtils;
|
|
|
import com.fs.common.utils.ServletUtils;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
|
import com.fs.common.utils.poi.ExcelUtil;
|
|
|
+import com.fs.company.domain.CompanyUser;
|
|
|
+import com.fs.company.service.ICompanyUserService;
|
|
|
+import com.fs.config.cloud.CloudHostProper;
|
|
|
import com.fs.crm.domain.CrmCustomer;
|
|
|
import com.fs.crm.service.ICrmCustomerService;
|
|
|
import com.fs.framework.security.LoginUser;
|
|
|
@@ -46,6 +49,7 @@ import java.text.ParseException;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 订单Controller
|
|
|
@@ -80,6 +84,10 @@ public class FsStoreOrderScrmController extends BaseController
|
|
|
private IFsStoreOrderAuditLogScrmService orderAuditLogService;
|
|
|
@Autowired
|
|
|
private ISysConfigService configService;
|
|
|
+ @Autowired
|
|
|
+ private ICompanyUserService companyUserService;
|
|
|
+ @Autowired
|
|
|
+ private CloudHostProper cloudHostProper;
|
|
|
|
|
|
/**
|
|
|
* 查询订单列表
|
|
|
@@ -90,6 +98,19 @@ public class FsStoreOrderScrmController extends BaseController
|
|
|
{
|
|
|
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
param.setCompanyId(loginUser.getCompany().getCompanyId());
|
|
|
+
|
|
|
+ // 郑多燕需求
|
|
|
+ if("广州郑多燕".equals(cloudHostProper.getCompanyName())){
|
|
|
+ // 根据当前销售所属的数据权限过滤订单;
|
|
|
+ List<CompanyUser> companyUsers = companyUserService.getDataScopeCompanyUser(loginUser.getUser().getUserId());
|
|
|
+ if(!companyUsers.isEmpty()){
|
|
|
+ List<Long> companyUserIds = companyUsers.stream().map(CompanyUser::getUserId).collect(Collectors.toList());
|
|
|
+ param.setCompanyUserIds(companyUserIds);
|
|
|
+ } else {
|
|
|
+ // 表示数据权限是本人
|
|
|
+ param.setCompanyUserId(loginUser.getUser().getUserId());
|
|
|
+ }
|
|
|
+ }
|
|
|
startPage();
|
|
|
if(!StringUtils.isEmpty(param.getCreateTimeRange())){
|
|
|
param.setCreateTimeList(param.getCreateTimeRange().split("--"));
|