diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index 7f5294a3..bfc960a1 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -385,7 +385,7 @@ public class XmTaskExecuserController { } if(tips.isOk()) { XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskExecuser.getId())); - if(xmTaskExecuserDb!=null && !"0".equals(xmTaskExecuserDb.getStatus())) { + if("0".equals(xmTaskExecuserDb.getStatus())) { xmTaskExecuserService.quotePrice(xmTaskExecuser); m.put("data",xmTaskExecuser); }else { diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java index 486980e6..0287ee84 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java @@ -60,7 +60,10 @@ public class XmProjectPhaseService extends BaseService { } if(addPhaseBudgetNouserAt==null) { addPhaseBudgetNouserAt=BigDecimal.ZERO; - } + } + if(g==null || g.isEmpty()){ + + } BigDecimal phaseBudgetInnerUserAt=NumberUtil.getBigDecimal(g.get("phaseBudgetInnerUserAt"),zero); BigDecimal phaseBudgetOutUserAt=NumberUtil.getBigDecimal(g.get("phaseBudgetOutUserAt"),zero); BigDecimal phaseBudgetNouserAt=NumberUtil.getBigDecimal(g.get("phaseBudgetNouserAt"),zero); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml index e3098d4e..1e77c355 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml @@ -30,13 +30,14 @@ p.plan_total_cost FROM XM.xm_project p - LEFT JOIN XM.xm_project_phase res ON p.id = res.project_id + LEFT JOIN XM.xm_project_phase res + ON p.id = res.project_id + and res.id not in + + #{item} + + where p.id=#{projectId} - and res.id not in - - #{item} - -