From a9fcf0b0c0fdd60b9244ce8ed85039a80cdbaf9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 27 Feb 2022 20:42:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/ctrl/XmProjectPhaseController.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java index 5dfab867..1fe83956 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java @@ -210,6 +210,9 @@ public class XmProjectPhaseController { Map m = new HashMap<>(); Tips tips=new Tips("成功新增一条数据"); try{ + if(!StringUtils.hasText(xmProjectPhase.getProjectId())){ + return ResponseHelper.failed("projectId-0","请上送项目编号"); + } if(StringUtils.isEmpty(xmProjectPhase.getId())) { xmProjectPhase.setId(xmProjectPhaseService.createKey("id")); }else{ @@ -349,6 +352,13 @@ public class XmProjectPhaseController { Map m = new HashMap<>(); Tips tips=new Tips("成功更新一条数据"); try{ + if(!StringUtils.hasText(xmProjectPhase.getId())){ + return ResponseHelper.failed("id-0","请上送计划编号"); + } + XmProjectPhase xmProjectPhaseDb=this.xmProjectPhaseService.selectOneObject(xmProjectPhase); + if(xmProjectPhaseDb==null){ + return ResponseHelper.failed("data-0","该计划已不存在"); + } XmProject xmProject=this.xmProjectService.getProjectFromCache(xmProjectPhase.getProjectId()); List groupVoList=groupService.getProjectGroupVoList(xmProjectPhase.getProjectId()); User user = LoginUtils.getCurrentUserInfo(); @@ -373,7 +383,7 @@ public class XmProjectPhaseController { xmProjectPhaseService.calcPhaseBudgetAmount(xmProjectPhase); List excludePhaseIds=new ArrayList<>(); excludePhaseIds.add(xmProjectPhase.getId()); - XmProjectPhase xmProjectPhaseDb=this.xmProjectPhaseService.selectOneObject(xmProjectPhase); + //如果修改了预算数据，才进行预算判断 if(xmProjectPhaseDb.getPhaseBudgetAt()!=null && xmProjectPhaseDb.getPhaseBudgetAt().compareTo(xmProjectPhase.getPhaseBudgetAt())!=0){ if(xmProjectPhase.getLvl()==1){