|
@@ -300,7 +300,7 @@ public class MaterialInfoController {
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- List<Long> projectIds = null;
|
|
|
+ List<Long> projectIds = new ArrayList<>();
|
|
|
String userId = user.getId();
|
|
|
String roleCode = roleService.getRoleCodeByUserId(userId);
|
|
|
if (null == tagCode || "".equals(tagCode.trim())) {
|
|
@@ -314,7 +314,7 @@ public class MaterialInfoController {
|
|
|
List<Long> projectIdsByProductId = projectService.getProjectIdsByProductId(productId);
|
|
|
projectIds.addAll(projectIdsByProductId);
|
|
|
}
|
|
|
- return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, offlineFlag, pageNo, pageSize);
|
|
|
+ return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, offlineFlag, pageNo, pageSize);
|
|
|
//运营经理、运营、运营助理
|
|
|
} else if ("operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
|
if (!Check.isNull(projectId)) {
|