|
@@ -458,7 +458,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
|
|
|
if ("admin".equals(roleCode)) {
|
|
|
//所有运营
|
|
|
- List<KuaiShouOperateGroupVo> allOperationManagerList = materialStareMapper.getOperationManagerUser("Operation");
|
|
|
+ List<KuaiShouOperateGroupVo> allOperationManagerList = materialStareMapper.getOperationManagerUser("perat");
|
|
|
List<String> allManagerList = allOperationManagerList.stream().map(KuaiShouOperateGroupVo:: getUserId).collect(Collectors.toList());
|
|
|
operatorUserIds = new HashSet<>(allManagerList);
|
|
|
}else if (roleCode.contains("OperationManager")){
|
|
@@ -477,8 +477,9 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
long now = Long.valueOf(DateUtils.getDateInteger(DateUtils.getDate("yyyy-MM-dd")));
|
|
|
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
|
- //查询运营数据
|
|
|
- List<KuaiShouOperateVo> listOperate = materialStareMapper.getKuaiShouOperateInfo(startDate,entDate,operatorUserIds);
|
|
|
+ //查询运营数据 -- 不区分媒体
|
|
|
+ List<KuaiShouOperateVo> listOperate = materialStareMapper.getKuaiShouOrBytedanceOperateInfo(startDate,entDate,operatorUserIds);
|
|
|
+
|
|
|
for (KuaiShouOperateVo operate : listOperate) {
|
|
|
|
|
|
Set<String> ids = new HashSet<String>(){{
|
|
@@ -529,7 +530,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
|
|
|
if ("admin".equals(roleCode)) {
|
|
|
//所有运营
|
|
|
- List<KuaiShouOperateGroupVo> allOperationManagerList = materialStareMapper.getOperationManagerUser("Operation");
|
|
|
+ List<KuaiShouOperateGroupVo> allOperationManagerList = materialStareMapper.getOperationManagerUser("perat");
|
|
|
List<String> allManagerList = allOperationManagerList.stream().map(KuaiShouOperateGroupVo:: getUserId).collect(Collectors.toList());
|
|
|
operatorUserIds = new HashSet<>(allManagerList);
|
|
|
}else if (roleCode.contains("OperationManager")){
|
|
@@ -549,8 +550,10 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
long now = Long.valueOf(DateUtils.getDateInteger(DateUtils.getDate("yyyy-MM-dd")));
|
|
|
|
|
|
//查询运营数据
|
|
|
- List<KuaiShouOperateVo> listOperate = materialStareMapper.getKuaiShouOperateInfo(startDate,entDate,operatorUserIds);
|
|
|
- for (KuaiShouOperateVo operate : listOperate) {
|
|
|
+ //List<KuaiShouOperateVo> listOperate = materialStareMapper.getKuaiShouOperateInfo(startDate,entDate,operatorUserIds);
|
|
|
+ List<KuaiShouOperateVo> listOperate = materialStareMapper.getKuaiShouOrBytedanceOperateInfo(startDate,entDate,operatorUserIds);
|
|
|
+
|
|
|
+ for (KuaiShouOperateVo operate : listOperate) {
|
|
|
|
|
|
Set<String> ids = new HashSet<String>(){{
|
|
|
add(operate.getUserId());
|