|
|
@@ -478,7 +478,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- aids.add(organizationManagementMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
|
|
|
}else {
|
|
|
t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
|
|
|
@@ -492,8 +491,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
t.setProcessStatus(ProcessStatus.YPYXY.getCode());
|
|
|
addBackOrder(orderNo, reason);
|
|
|
addOrderLog(orderNo, OrderLogProcess.BH.getCode());
|
|
|
-
|
|
|
- }else if (outsource==1) {}
|
|
|
+ }
|
|
|
aids.add(t2.getSalesmanId());
|
|
|
type=NoticeStatus.ORDER_NO.getCode();
|
|
|
}
|
|
|
@@ -946,7 +944,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
n.setAid(string);
|
|
|
nlist.add(n);
|
|
|
Admin admin = adminMapper.selectAllByid(string);
|
|
|
- if(admin!=null&&admin.getEmail()!=null)adminIds+=admin.getEmail()+",";
|
|
|
+ if(admin!=null&&StringUtils.isNotBlank(admin.getEmail()))adminIds+=admin.getEmail()+",";
|
|
|
}
|
|
|
if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
|
|
|
if(StringUtils.isNotBlank(adminIds))adminIds.substring(0, adminIds.length()-1);
|