|
@@ -288,6 +288,7 @@ public class MaterialInfoController {
|
|
|
@GetMapping(value = "/listV2")
|
|
|
public Map<String, Object> queryPageList(String type, Integer status, Long productId, String materialName, String code,
|
|
|
String startDate, String endDate, String tagCode,
|
|
|
+ @RequestParam(name = "projectId", required = false) Long projectId,
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
@@ -303,7 +304,7 @@ public class MaterialInfoController {
|
|
|
productIds = new ArrayList<>();
|
|
|
productIds.add(productId);
|
|
|
}
|
|
|
- return materialInfoService.getListByParams(tagCode, type, status, productIds, materialName, code, startDate, endDate, null, pageNo, pageSize);
|
|
|
+ return materialInfoService.getListByParams(projectId, tagCode, type, status, productIds, materialName, code, startDate, endDate, null, pageNo, pageSize);
|
|
|
} else if ("designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode) || "plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode)) {
|
|
|
//查询自己所在项目下的数据
|
|
|
if (null == productId || productId == 0) {
|
|
@@ -313,14 +314,14 @@ public class MaterialInfoController {
|
|
|
productIds = new ArrayList<>();
|
|
|
productIds.add(productId);
|
|
|
}
|
|
|
- return materialInfoService.getListByParams(tagCode, type, status, productIds, materialName, code, startDate, endDate, null, pageNo, pageSize);
|
|
|
+ return materialInfoService.getListByParams(projectId, tagCode, type, status, productIds, materialName, code, startDate, endDate, null, pageNo, pageSize);
|
|
|
} else {
|
|
|
//查询自己上传的视频
|
|
|
if (null != productId && productId != 0) {
|
|
|
productIds = new ArrayList<>();
|
|
|
productIds.add(productId);
|
|
|
}
|
|
|
- return materialInfoService.getListByParams(tagCode, type, status, productIds, materialName, code, startDate, endDate, userId, pageNo, pageSize);
|
|
|
+ return materialInfoService.getListByParams(projectId, tagCode, type, status, productIds, materialName, code, startDate, endDate, userId, pageNo, pageSize);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -511,7 +512,7 @@ public class MaterialInfoController {
|
|
|
JSONArray slogans = materialInfo.getSlogans();
|
|
|
if(null!=slogans&&!slogans.isEmpty()){
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- slogenInfoService.insertSlogans(materialInfoEntity.getCode(),slogans,user.getId());
|
|
|
+ slogenInfoService.insertSlogans(materialInfoEntity.getProjectId(),materialInfoEntity.getCode(),slogans,user.getId());
|
|
|
}
|
|
|
}
|
|
|
boolean ok = materialInfoService.updateById(materialInfo);
|