|
|
@@ -494,14 +494,15 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t.getApproval());
|
|
|
if (t.getOrderDep()!=null){
|
|
|
List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(t.getOrderDep(),AFTConstants.SALESMAN_ADMIN);
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
if (admins.isEmpty()){
|
|
|
OrganizationListOut dep = departmentMapper.selectAllById(t.getOrderDep());
|
|
|
admins = adminMapper.listAdminBydepIdAndRoleType(dep.getSuperId(),AFTConstants.SALESMAN_ADMIN);
|
|
|
}
|
|
|
- StringBuffer str =new StringBuffer();
|
|
|
for (Admin admin : admins) {
|
|
|
if (!str.toString().contains(admin.getName()))str.append(admin.getName()).append(",");
|
|
|
}
|
|
|
+ t.setExamineName(str.toString());
|
|
|
}
|
|
|
}
|
|
|
if (t2.getApproval().equals(ApprovalNewState.ZCBH.getCode()) ||
|