|
@@ -324,9 +324,8 @@ public class MaterialInfoController {
|
|
public Map<String, Object> queryPageList(String type, Integer status, Long productId, String materialName, String code,
|
|
public Map<String, Object> queryPageList(String type, Integer status, Long productId, String materialName, String code,
|
|
String startDate, String endDate, String tagCode,
|
|
String startDate, String endDate, String tagCode,
|
|
Long projectId, String clipId, String shotId, String planId, String leaderName,
|
|
Long projectId, String clipId, String shotId, String planId, String leaderName,
|
|
- Integer syncKuaishou, Integer syncBytedance,
|
|
|
|
|
|
+ Integer syncKuaishou, Integer syncBytedance, Integer materialInnovate,
|
|
@RequestParam(name = "offlineFlag", required = false) Integer offlineFlag,
|
|
@RequestParam(name = "offlineFlag", required = false) Integer offlineFlag,
|
|
-
|
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
@@ -344,7 +343,7 @@ public class MaterialInfoController {
|
|
List<Long> projectIdsByProductId = projectService.getProjectIdsByProductId(productId);
|
|
List<Long> projectIdsByProductId = projectService.getProjectIdsByProductId(productId);
|
|
projectIds.addAll(projectIdsByProductId);
|
|
projectIds.addAll(projectIdsByProductId);
|
|
}
|
|
}
|
|
- return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance);
|
|
|
|
|
|
+ return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance, materialInnovate);
|
|
//运营经理、运营、运营助理
|
|
//运营经理、运营、运营助理
|
|
} else if ("operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
} else if ("operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
if (!Check.isNull(projectId)) {
|
|
if (!Check.isNull(projectId)) {
|
|
@@ -360,7 +359,7 @@ public class MaterialInfoController {
|
|
projectIds.addAll(partakeProjectIds);
|
|
projectIds.addAll(partakeProjectIds);
|
|
projectIds.addAll(productProjectIds);
|
|
projectIds.addAll(productProjectIds);
|
|
}
|
|
}
|
|
- return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance);
|
|
|
|
|
|
+ return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance, materialInnovate);
|
|
|
|
|
|
} else if ("designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode) || "plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode) || "clip".equals(roleCode)) {
|
|
} else if ("designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode) || "plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode) || "clip".equals(roleCode)) {
|
|
//查询自己所在项目下的数据
|
|
//查询自己所在项目下的数据
|
|
@@ -371,7 +370,7 @@ public class MaterialInfoController {
|
|
} else {
|
|
} else {
|
|
projectIds = projectMemberService.getProjectIdsByProductId(null, userId);
|
|
projectIds = projectMemberService.getProjectIdsByProductId(null, userId);
|
|
}
|
|
}
|
|
- return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance);
|
|
|
|
|
|
+ return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance, materialInnovate);
|
|
} else {
|
|
} else {
|
|
//查询自己上传的视频
|
|
//查询自己上传的视频
|
|
if (!Check.isNull(projectId)) {
|
|
if (!Check.isNull(projectId)) {
|
|
@@ -379,7 +378,7 @@ public class MaterialInfoController {
|
|
} else if (!Check.isNull(productId)) {
|
|
} else if (!Check.isNull(productId)) {
|
|
projectIds = projectMemberService.getProjectIdsByProductId(productId, userId);
|
|
projectIds = projectMemberService.getProjectIdsByProductId(productId, userId);
|
|
}
|
|
}
|
|
- return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, userId, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance);
|
|
|
|
|
|
+ return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, userId, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance, materialInnovate);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|