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;