浏览代码

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

anderx 6 年之前
父节点
当前提交
17412d76c6
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

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

@@ -446,7 +446,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		alist.add(o.getSalesmanId());
 		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-		orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), o.getOrderNo(), a.getId());
+		orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), o.getOrderNo(), TokenManager.getAdminId());
 		return 1;
 	}
 	@Override