From 6a71b83602617237e1415e8128634a89e3c8b58b Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 12 Apr 2023 16:22:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E6=8A=A5=E7=9C=81=E5=B1=80=20?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0rebug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java      | 2 +-
 .../java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java
index 3f368c4..92092eb 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java
@@ -75,7 +75,7 @@ public class DefaultDeclaredProjectManage {
                     .throwMessage(String.format("申报失败! 申报总金额【%s】 不等于其它申报金额 【%s】",declareAmount,totalAmount));
 
             //判断 年度计划金额 如果开着的话
-            if(projectInfo.getIsAnnualPlanAmount()){
+            if(Objects.nonNull(projectInfo.getAnnualPlanAmount())){
                 BigDecimal annualPlanAmount = projectInfo.getAnnualPlanAmount();
 
                 VUtils.isTrue(annualPlanAmount.compareTo(BigDecimal.ZERO) <= 0)
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java
index 434dcb7..771a0f0 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java
@@ -2,11 +2,9 @@ package com.ningdatech.pmapi.sys.controller;
 
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage;
-import com.ningdatech.pmapi.user.util.LoginUserUtil;
 import com.wflow.bean.dto.WflowModelHistorysDto;
 import com.wflow.bean.vo.WflowModelVo;
 import com.wflow.service.ModelGroupService;
-import com.wflow.workflow.bean.dto.OrgInfoDTO;
 import com.wflow.workflow.service.ProcessModelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;