|
|
@@ -361,7 +361,8 @@ public class WorkbenchManage { |
|
|
|
.eq(Project::getProjectYear, req.getProjectYear()) |
|
|
|
.eq(req.getUnitStrip() != null, Project::getUnitStrip, req.getUnitStrip()) |
|
|
|
.eq(Project::getNewest, Boolean.TRUE) |
|
|
|
.ne(Project::getStatus, ProjectStatus.CHANGE_APPLY_PASSED.getCode()) |
|
|
|
.notIn(Project::getStatus, ProjectStatus.CHANGE_APPLY_PASSED.getCode(), |
|
|
|
ProjectStatus.STOPPED_PASSED.getCode()) |
|
|
|
.exists(ExistsSqlConst.PROJECT_EXISTS_STATUS_CHANGE + " and npsc.event = {0}", |
|
|
|
ProjectStateChangeEvent.PROJECT_APPLICATION_SUBMIT) |
|
|
|
.in(Project::getBuildOrgCode, CollUtils.convert(viewUnitIds, String::valueOf)); |
|
|
|