From ec2509fce35be38e92fadee615b4627d849c9a72 Mon Sep 17 00:00:00 2001
From: qqkj <qqkj@163.com>
Date: Fri, 16 Apr 2021 21:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=80=99=E9=80=89=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xm/core/ctrl/XmTaskExecuserController.java  |  2 +-
 .../com/xm/core/service/XmProjectPhaseService.java  |  5 ++++-
 .../mapper/xm/core/dao/XmProjectPhaseMapper.xml     | 13 +++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

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
+				<if test=" excludePhaseIds !=null "> and res.id not  in
+					<foreach collection="excludePhaseIds" item="item" index="index" open="(" separator="," close=")" >
+						#{item}
+					</foreach>
+				</if>
 		where p.id=#{projectId}
-		  <if test=" excludePhaseIds !=null "> and res.id not  in
-				    <foreach collection="excludePhaseIds" item="item" index="index" open="(" separator="," close=")" >  
-				        #{item}  
-				    </foreach>  
-		  </if>
 	</select> 
 	 
 	<update id="loadTasksToXmProjectPhase" parameterType="String" statementType="CALLABLE">