|
@@ -56,6 +56,10 @@ public class ProjectController {
|
|
|
private ITransferAccountService transferAccountService;
|
|
|
@Autowired
|
|
|
private IUserAllocationService userAllocationService;
|
|
|
+ @Autowired
|
|
|
+ private ISysRoleExtService sysRoleService;
|
|
|
+ @Autowired
|
|
|
+ private IMaterialInfoService materialInfoService;
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "项目-分页列表查询", notes = "项目-分页列表查询")
|
|
@@ -197,16 +201,14 @@ public class ProjectController {
|
|
|
Page<Project> page = new Page<>(pageNo, pageSize);
|
|
|
IPage<Project> pageList = null;
|
|
|
// 查询所有
|
|
|
- if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode) || "sale".equals(roleCode) || "saleDirector".equals(roleCode)) {
|
|
|
+ if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode)) {
|
|
|
pageList = projectService.page(page, queryWrapper);
|
|
|
// 经理岗查询所在项目
|
|
|
} else if ("designTeamLeader".equals(roleCode) || "touTiaoOperationManager".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "planeLeader".equals(roleCode)) {
|
|
|
-
|
|
|
List<Long> projectIds = projectMemberService.getProjectByMap(userId);
|
|
|
if (!Check.isNull(projectIds)) {
|
|
|
queryWrapper.in("id", projectIds);
|
|
|
pageList = projectService.page(page, queryWrapper);
|
|
|
-
|
|
|
}
|
|
|
// 剪辑 编导 平面 拍摄 查询自己为设计负责人项目
|
|
|
} else if ("clip".equals(roleCode) || "shot".equals(roleCode) || "plan".equals(roleCode) || "plane".equals(roleCode)) {
|
|
@@ -216,6 +218,8 @@ public class ProjectController {
|
|
|
} else if ("operator".equals(roleCode) || "operationAssistant".equals(roleCode)) {
|
|
|
queryWrapper.eq("responsible_id", userId);
|
|
|
pageList = projectService.page(page, queryWrapper);
|
|
|
+ } else if (roleCode.contains("sale")) {
|
|
|
+ queryWrapper.eq("sale_id", userId);
|
|
|
} else {
|
|
|
queryWrapper.eq("responsible_id", userId);
|
|
|
pageList = projectService.page(page, queryWrapper);
|
|
@@ -339,10 +343,6 @@ public class ProjectController {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- @Autowired
|
|
|
- private ISysRoleExtService sysRoleService;
|
|
|
- @Autowired
|
|
|
- private IMaterialInfoService materialInfoService;
|
|
|
|
|
|
/**
|
|
|
* 编辑
|