From 29a2992132038e417120045539ad18df387574a7 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Sat, 7 Oct 2023 17:04:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=20=E8=8D=89=E7=A8=BF?=
 =?UTF-8?q?=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java
index da8a94d..da87009 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java
@@ -259,7 +259,7 @@ public class ProjectRenewalFundManage {
             declaration.setRegionCode(StringUtils.isNotBlank(baseinfo.getBaseAreaCode()) ? baseinfo.getBaseAreaCode().substring(0,6) : StringUtils.EMPTY);
             declaration.setOrgCode(baseinfo.getBaseBuildDeprtDing());
         }else if(Objects.nonNull(operationBaseinfo)){
-            declaration.setRegionCode(StringUtils.isNotBlank(operationBaseinfo.getBaseAreaCode()) ? baseinfo.getBaseAreaCode().substring(0,6) : StringUtils.EMPTY);
+            declaration.setRegionCode(StringUtils.isNotBlank(operationBaseinfo.getBaseAreaCode()) ? operationBaseinfo.getBaseAreaCode().substring(0,6) : StringUtils.EMPTY);
             declaration.setOrgCode(operationBaseinfo.getBaseBuildDeprtDing());
         }
 
@@ -303,7 +303,7 @@ public class ProjectRenewalFundManage {
             projectRenewal.setRegionCode(StringUtils.isNotBlank(baseinfo.getBaseAreaCode()) ? baseinfo.getBaseAreaCode().substring(0,6) : StringUtils.EMPTY);
             projectRenewal.setOrgCode(baseinfo.getBaseBuildDeprtDing());
         }else if(Objects.nonNull(operationBaseinfo)){
-            projectRenewal.setRegionCode(StringUtils.isNotBlank(operationBaseinfo.getBaseAreaCode()) ? baseinfo.getBaseAreaCode().substring(0,6) : StringUtils.EMPTY);
+            projectRenewal.setRegionCode(StringUtils.isNotBlank(operationBaseinfo.getBaseAreaCode()) ? operationBaseinfo.getBaseAreaCode().substring(0,6) : StringUtils.EMPTY);
             projectRenewal.setOrgCode(operationBaseinfo.getBaseBuildDeprtDing());
         }
         projectRenewal.setAuditOpinion(param.getAuditOpinion());