Просмотр исходного кода

Merge branch 'test' of jishutao/kede-server into prod

anderx лет назад: 2
Родитель
Сommit
347edc9675
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -556,7 +556,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				if (a.getId().equals(AFTConstants.CAOJIN_AID)){
 				if (a.getId().equals(AFTConstants.CAOJIN_AID)){
 					t.setApproval(ApprovalNewState.DSZDSH.getCode());
 					t.setApproval(ApprovalNewState.DSZDSH.getCode());
 				}else {
 				}else {
-					Department dep = departmentMapper.selectByPrimaryKey(t2.getOrderDep());
+					Department dep = departmentMapper.selectByPrimaryKey(t.getOrderDep());
 					if(dep.getProvince()==11){
 					if(dep.getProvince()==11){
 						t.setApproval(ApprovalNewState.FZCDSH.getCode());
 						t.setApproval(ApprovalNewState.FZCDSH.getCode());
 					}else {
 					}else {