Ver código fonte

Merge branch 'test'

anderx 2 anos atrás
pai
commit
fc5e52a48e

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -301,7 +301,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
 		if (examine==2){
 			//特批通过和特批是财务审核
-			if (t2.getApproval()==2||t2.getApproval()==0){
+			if (financeCount!=null&&(t2.getApproval()==2||t2.getApproval()==0)){
 				FinanceCount newFinanceCount=new FinanceCount();
 				newFinanceCount.setId(financeCount.getId());
 				newFinanceCount.setInvoiceUnauditedCount(financeCount.getInvoiceUnauditedCount()-1);
@@ -312,7 +312,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			}
 
 		}else if (examine==3){
-			if (t2.getApproval()==2||t2.getApproval()==0){
+			if (financeCount!=null&&(t2.getApproval()==2||t2.getApproval()==0)){
 				FinanceCount newFinanceCount=new FinanceCount();
 				newFinanceCount.setId(financeCount.getId());
 				newFinanceCount.setInvoiceCount(financeCount.getInvoiceCount()-1);