From b45001d265d3bafbcb4564b0b6d8acd62e2bd083 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Tue, 3 Dec 2024 10:57:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.=20=E9=A1=B9=E7=9B=AE=E7=BB=88?= =?UTF-8?q?=E6=AD=A2=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E6=A1=86=E3=80=81?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=88=E6=AD=A2=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=EF=BC=9B=202.=20?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E4=B8=8D?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=BB=88=E6=AD=A2=E5=92=8C=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=A1=B9=E7=9B=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectlib/manage/ProjectStoppedManage.java | 22 +++++++++++++++++++++- .../pm/api/workbench/manage/WorkbenchManage.java | 2 ++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectStoppedManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectStoppedManage.java index 8be6526..0773b1b 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectStoppedManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectStoppedManage.java @@ -23,6 +23,8 @@ import com.hz.pm.api.projectlib.model.vo.ProjectStoppedDetailVO; import com.hz.pm.api.projectlib.service.IProjectInstService; import com.hz.pm.api.projectlib.service.IProjectService; import com.hz.pm.api.sys.manage.ProcessModelManage; +import com.hz.pm.api.user.helper.MhUnitQueryAuthHelper; +import com.hz.pm.api.user.helper.MhUnitQueryAuthHelper.UnitQueryState; import com.hz.pm.api.user.security.model.UserInfoDetails; import com.hz.pm.api.user.util.LoginUserUtil; import com.ningdatech.basic.model.PageVo; @@ -63,6 +65,7 @@ public class ProjectStoppedManage { private final ProcessModelManage processModelManage; private final DeclaredProjectHelper declaredProjectHelper; private final ProjectChangeStopHelper projectChangeStopHelper; + private final MhUnitQueryAuthHelper mhUnitQueryAuthHelper; @Transactional(rollbackFor = Exception.class) public synchronized void submitProjectStoppedApply(SubmitProjectStoppedApplyReq req) { @@ -95,10 +98,19 @@ public class ProjectStoppedManage { } public PageVo page(ProjectListReq req) { + Long buildOrgCode = req.clearBuildOrgCode(); + UnitQueryState unitQueryState = mhUnitQueryAuthHelper.listCanViewUnitIds(buildOrgCode); + if (!unitQueryState.isState()) { + return PageVo.empty(); + } LambdaQueryWrapper query = ProjectManageUtil.projectQuery(req); query.eq(Project::getNewest, Boolean.TRUE) .orderByDesc(Project::getUpdateOn) .isNotNull(Project::getStoppedStatus); + BizUtils.notEmpty(unitQueryState.getUnitIds(), w -> { + List buildOrgCodeStrList = CollUtils.convert(w, String::valueOf); + query.in(Project::getBuildOrgCode, buildOrgCodeStrList); + }); Page page = req.page(); projectService.page(page, query); List records = page.getRecords(); @@ -133,13 +145,21 @@ public class ProjectStoppedManage { } public List options() { + UnitQueryState unitQueryState = mhUnitQueryAuthHelper.listCanViewUnitIds(null); + if (!unitQueryState.isState()) { + return Collections.emptyList(); + } LambdaQueryWrapper query = Wrappers.lambdaQuery(Project.class) .select(Project::getId, Project::getProjectCode, Project::getProjectName) .eq(Project::getNewest, Boolean.TRUE) .orderByDesc(Project::getCreateOn) .notIn(Project::getStatus, ProjectStatus.STOPPED_PASSED.getCode(), ProjectStatus.ON_STOPPED_APPLY.getCode()); - UserInfoDetails userDetail = LoginUserUtil.userDetail(); + BizUtils.notEmpty(unitQueryState.getUnitIds(), w -> { + List buildOrgCodeStrList = CollUtils.convert(w, String::valueOf); + query.in(Project::getBuildOrgCode, buildOrgCodeStrList); + }); + UserInfoDetails userDetail = LoginUserUtil.userDetailNotNull(); if (!userDetail.hasSuperAdmin()) { query.eq(Project::getBuildOrgCode, userDetail.getMhUnitIdStr()); } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java index 79ea93d..4301a5b 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java @@ -1039,6 +1039,8 @@ public class WorkbenchManage { .eq(Project::getNewest, Boolean.TRUE) .eq(req.getProjectYear() != null, Project::getProjectYear, req.getProjectYear()) .eq(req.getUnitStrip() != null, Project::getUnitStrip, req.getUnitStrip()) + .notIn(Project::getStatus, ProjectStatus.CHANGE_APPLY_PASSED.getCode(), + ProjectStatus.STOPPED_PASSED.getCode()) .eq(Project::getIsMajorProject, Boolean.TRUE) .orderByDesc(Project::getUpdateOn); UnitQueryState state = mhUnitQueryAuthHelper.listCanViewUnitIds(req.getUnitId());