|
|
@@ -39,7 +39,6 @@ import com.hz.pm.api.sys.manage.ProcessModelManage; |
|
|
|
import com.hz.pm.api.user.security.model.UserInfoDetails; |
|
|
|
import com.hz.pm.api.user.util.LoginUserUtil; |
|
|
|
import com.ningdatech.basic.exception.BizException; |
|
|
|
import com.ningdatech.basic.model.ITree; |
|
|
|
import com.ningdatech.basic.model.PageVo; |
|
|
|
import com.ningdatech.basic.util.CollUtils; |
|
|
|
import com.wflow.bean.entity.WflowModels; |
|
|
@@ -196,9 +195,12 @@ public class ProjectChangeManage { |
|
|
|
.select(Project::getId, Project::getProjectCode, Project::getProjectName) |
|
|
|
.eq(Project::getNewest, Boolean.TRUE) |
|
|
|
.orderByDesc(Project::getCreateOn) |
|
|
|
.notExists("select 1 from nd_project_change_history npch where " + |
|
|
|
"npch.project_code = nd_project.project_code and npch.status = {0}", |
|
|
|
ProjectChangeStatus.CHANGE_FAILED.getCode()) |
|
|
|
.notIn(Project::getStatus, ProjectStatus.STOPPED.getCode(), |
|
|
|
ProjectStatus.ON_STOPPED_APPLY.getCode(), |
|
|
|
ProjectStatus.ON_CHANGE_APPLY); |
|
|
|
ProjectStatus.ON_CHANGE_APPLY.getCode()); |
|
|
|
UserInfoDetails userDetail = LoginUserUtil.loginUserDetail(); |
|
|
|
if (!userDetail.getSuperAdmin()) { |
|
|
|
query.eq(Project::getBuildOrgCode, userDetail.getMhUnitIdStr()); |
|
|
|