anderx месяцев назад: 10
Родитель
Сommit
0bf2931492

+ 3 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1675,9 +1675,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		List<TOrderTaskListBo> listBos = tOrderTaskMapper.splitProjectList(tOrderTask.getId(), 1);
 		int htMember=0,additionalDeduction=0,rdAwardsubsidy=0;
 		for (TOrderTaskListBo e : listBos) {
-			if (e.getHtMember()==1)htMember=1;
-			if (e.getAdditionalDeduction()==1)additionalDeduction=1;
-			if (e.getRdAwardsubsidy()==1)rdAwardsubsidy=1;
+			if (e.getHtMember()!=null&&e.getHtMember()==1)htMember=1;
+			if (e.getAdditionalDeduction()!=null&&e.getAdditionalDeduction()==1)additionalDeduction=1;
+			if (e.getRdAwardsubsidy()!=null&&e.getRdAwardsubsidy()==1)rdAwardsubsidy=1;
 		}
 		tOrderTask.setHtMember(htMember);
 		tOrderTask.setAdditionalDeduction(additionalDeduction);