运维 草稿箱

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());