|
|
@@ -597,8 +597,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
noc.setExamineName(ton.getSalesmanName());
|
|
|
}else if (noc.getProcessState()== OrderChangeProcess.YXGLY.getCode()){
|
|
|
TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
|
|
|
- OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
|
|
|
- noc.setExamineName(dep.getManagerName());
|
|
|
+
|
|
|
+ StringBuffer str=new StringBuffer();
|
|
|
+ List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(ton.getOrderDep(),AFTConstants.SALESMAN_ADMIN);
|
|
|
+ if (admins.isEmpty()){
|
|
|
+ OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
|
|
|
+ admins = adminMapper.listAdminBydepIdAndRoleType(dep.getSuperId(),AFTConstants.SALESMAN_ADMIN);
|
|
|
+ }
|
|
|
+ for (Admin admin : admins) {
|
|
|
+ if (!str.toString().contains(admin.getName()))str.append(admin.getName()).append(",");
|
|
|
+ }
|
|
|
+ if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
}else if (noc.getProcessState()== OrderChangeProcess.JSY.getCode()){
|
|
|
List<OrderExamineBo> os = orderExamineMapper.selectByOrderNo(noc.getOrderNo(), 0);
|
|
|
StringBuffer str=new StringBuffer();
|