|
@@ -470,7 +470,7 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
|
List<String> ids = new ArrayList<>();
|
|
|
List<JSONObject> departIds = new ArrayList<>();
|
|
|
//管理员和运营总经理 可以查看所有快手的运营信息
|
|
|
- if ("genera_manager_of_operations".equals(roleCode) || "admin".equals(roleCode)) {
|
|
|
+ if ("genera_manager_of_operations".equals(roleCode) || "admin".equals(roleCode) || "salesSupportManager".equals(roleCode)) {
|
|
|
JSONObject obj = new JSONObject();
|
|
|
//快手运营部 峰级部门 ID
|
|
|
obj.put("id", "024b0dc0840045afb048022a8c61253f");
|
|
@@ -498,7 +498,7 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
|
String userId = request.getString("userId");
|
|
|
String startTime = request.getString("startTime");
|
|
|
String endTime = request.getString("endTime");
|
|
|
- if (Check.isNull(userId)||Check.isNull(startTime)||Check.isNull(endTime)) {
|
|
|
+ if (Check.isNull(userId) || Check.isNull(startTime) || Check.isNull(endTime)) {
|
|
|
return Result.error("缺少账户入参");
|
|
|
}
|
|
|
String sortCode = request.getString("sortCode");
|
|
@@ -541,13 +541,13 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
|
int total = 0;
|
|
|
//单日数据
|
|
|
if (endTime.equals(startTime)) {
|
|
|
- if(!today.equals(startTime)){
|
|
|
+ if (!today.equals(startTime)) {
|
|
|
request.put("yesterday", startTime);
|
|
|
}
|
|
|
total = etlHourlyAccountMapper.operatingStaffDataListTotal(request);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
list = etlHourlyAccountMapper.operatingStaffDataList(request);
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
total = etlDailyAccountMapper.operatingStaffDataListTotal(request);
|
|
|
PageHelper.startPage(pageNo, pageSize, false);
|
|
|
list = etlDailyAccountMapper.operatingStaffDataList(request);
|