|
@@ -241,18 +241,16 @@ public class ProjectController {
|
|
String projectName = project.getProjectName();
|
|
String projectName = project.getProjectName();
|
|
project.setProjectName(null);
|
|
project.setProjectName(null);
|
|
|
|
|
|
- String userId = project.getUserId();
|
|
|
|
- project.setUserId(null);
|
|
|
|
|
|
|
|
QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
|
|
QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
|
|
Page<Project> page = new Page<>(pageNo, pageSize);
|
|
Page<Project> page = new Page<>(pageNo, pageSize);
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
|
|
if ("operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
if ("operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
- queryWrapper.eq("responsible_id", userId);
|
|
|
|
|
|
+ queryWrapper.eq("responsible_id", sysUser.getId());
|
|
|
|
|
|
} else if ("plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode) || "clip".equals(roleCode) || "designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode)) {
|
|
} else if ("plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode) || "clip".equals(roleCode) || "designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode)) {
|
|
- queryWrapper.eq("design_responsible_id", userId);
|
|
|
|
|
|
+ queryWrapper.eq("design_responsible_id", sysUser.getId());
|
|
}
|
|
}
|
|
|
|
|
|
if (!Check.isNull(projectName)) {
|
|
if (!Check.isNull(projectName)) {
|