@@ -448,6 +448,7 @@ public class ProjectLibManage { | |||||
List<Long> viewUnitIds = mhUnitCache.getViewChildIdsRecursion(req.getDeclaredUnitId()); | List<Long> viewUnitIds = mhUnitCache.getViewChildIdsRecursion(req.getDeclaredUnitId()); | ||||
req.setDeclaredUnitIds(viewUnitIds); | req.setDeclaredUnitIds(viewUnitIds); | ||||
} | } | ||||
req.setNotInStatusList(Collections.singletonList(ProjectStatus.CHANGE_APPLY_PASSED.getCode())); | |||||
Page<ProjectPO> page = projectService.pageLibWithPermission(req.page(), req); | Page<ProjectPO> page = projectService.pageLibWithPermission(req.page(), req); | ||||
if (CollUtil.isEmpty(page.getRecords())) { | if (CollUtil.isEmpty(page.getRecords())) { | ||||
@@ -335,6 +335,12 @@ | |||||
topped | topped | ||||
FROM nd_project p | FROM nd_project p | ||||
WHERE p.newest = 1 | WHERE p.newest = 1 | ||||
<if test="req.notInStatusList != null and req.notInStatusList.size > 0"> | |||||
and p.status not in | |||||
<foreach close=")" collection="req.notInStatusList" item="notInStatus" open="(" separator=","> | |||||
#{notInStatus} | |||||
</foreach> | |||||
</if> | |||||
<if test="req.id != null"> | <if test="req.id != null"> | ||||
and p.id = #{req.id} | and p.id = #{req.id} | ||||
</if> | </if> | ||||
@@ -135,6 +135,9 @@ public class ProjectListReq extends PagePo { | |||||
@ApiModelProperty("tab状态") | @ApiModelProperty("tab状态") | ||||
private Integer tabStatus; | private Integer tabStatus; | ||||
@ApiModelProperty("不包含的状态") | |||||
private List<Integer> notInStatusList; | |||||
public Long clearBuildOrgCode() { | public Long clearBuildOrgCode() { | ||||
String tmpBuildOrgCode = this.getBuildOrgCode(); | String tmpBuildOrgCode = this.getBuildOrgCode(); | ||||
if (StrUtil.isNotBlank(tmpBuildOrgCode)) { | if (StrUtil.isNotBlank(tmpBuildOrgCode)) { | ||||