From 6cf87f2c3ada648a134f2b7e4e31270b2ec9cbdf Mon Sep 17 00:00:00 2001 From: WendyYang Date: Tue, 3 Sep 2024 12:23:16 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E7=BB=88=E9=AA=8C=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java | 6 ++---- .../java/com/hz/pm/api/projectlib/model/req/ProjectListReq.java | 9 +++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java index 6f19a7d..1751ede 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java @@ -108,8 +108,7 @@ public class FinalAcceptanceManage { */ public FinalAcceptProgressStatisticsVO finalAcceptProgressStatistics(ProjectListReq req) { UserInfoDetails user = LoginUserUtil.loginUserDetail(); - String buildOrgCode = req.getBuildOrgCode(); - req.setBuildOrgCode(null); + String buildOrgCode = req.clearBuildOrgCode(); Long buildOrgCodeNum = NumberUtil.parseLong(buildOrgCode, null); UnitQueryState queryState = mhUnitQueryHelper.listCanViewUnitIds(buildOrgCodeNum, user); if (!queryState.isState()) { @@ -156,8 +155,7 @@ public class FinalAcceptanceManage { */ public PageVo projectLibList(ProjectListReq req) { UserInfoDetails user = LoginUserUtil.loginUserDetail(); - String buildOrgCode = req.getBuildOrgCode(); - req.setBuildOrgCode(null); + String buildOrgCode = req.clearBuildOrgCode(); Long buildOrgCodeNum = NumberUtil.parseLong(buildOrgCode, null); UnitQueryState queryState = mhUnitQueryHelper.listCanViewUnitIds(buildOrgCodeNum, user); if (!queryState.isState()) { diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/req/ProjectListReq.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/req/ProjectListReq.java index 7e95dba..82f54cc 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/req/ProjectListReq.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/req/ProjectListReq.java @@ -1,5 +1,6 @@ package com.hz.pm.api.projectlib.model.req; +import cn.hutool.core.util.StrUtil; import com.hz.pm.api.common.enumeration.ExportOptionEnum; import com.ningdatech.basic.model.PagePo; import io.swagger.annotations.ApiModel; @@ -130,4 +131,12 @@ public class ProjectListReq extends PagePo { @ApiModelProperty("tab状态") private Integer tabStatus; + public String clearBuildOrgCode() { + String tmpBuildOrgCode = this.getBuildOrgCode(); + if (StrUtil.isNotBlank(tmpBuildOrgCode)) { + this.setBuildOrgCode(null); + } + return tmpBuildOrgCode; + } + }