|
@@ -258,14 +258,12 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
|
|
|
List<String> receiverList = new ArrayList<String>();
|
|
|
if(StringUtils.isNotBlank(sbInfo.getRepairUser())){
|
|
|
SysUserVO user = sysUserService.selectUserVO(sbInfo.getRepairUser());
|
|
|
- receiverList.add(user.getPhone());
|
|
|
userIds.add(sbInfo.getRepairUser());
|
|
|
openIds.add(user.getWxOpenid());
|
|
|
mails.add(user.getEmail());
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(sbInfo.getRepairUserSecond())){
|
|
|
SysUserVO user = sysUserService.selectUserVO(sbInfo.getRepairUserSecond());
|
|
|
- receiverList.add(user.getPhone());
|
|
|
userIds.add(sbInfo.getRepairUserSecond());
|
|
|
openIds.add(user.getWxOpenid());
|
|
|
mails.add(user.getEmail());
|
|
@@ -295,11 +293,20 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
|
|
|
MessageTemplateUtil.getFreemarkerHtmlContent(repairUrl,model,sb),
|
|
|
model.getId(), userIds, mails));
|
|
|
|
|
|
- // 发送微信通知给第一维修人,第二维修人
|
|
|
+ // 发送微信通知给所有维修人角色
|
|
|
/* for(String openId : openIds){
|
|
|
WeChatMessageUtil.repairMessage( openId, repairUrl,model,sb);
|
|
|
}*/
|
|
|
// 发送短信通知给第一维修人,和第二维修人,其他人不发短信,且必须是正式环境
|
|
|
+ SysUserDTO sysUserDTO = new SysUserDTO();
|
|
|
+ sysUserDTO.setRoleCode(SysRoleCodeEnum.Maintenance.name());
|
|
|
+ List<SysUserVO> sysUserVOList = sysUserService.getDeptChildrenRoleUser(sysUserDTO);
|
|
|
+ if(CollectionUtil.isNotEmpty(sysUserVOList)){
|
|
|
+ for(SysUserVO sysUserVO:sysUserVOList){
|
|
|
+ System.out.println(sysUserVO.getPhone());
|
|
|
+ receiverList.add(sysUserVO.getPhone());
|
|
|
+ }
|
|
|
+ }
|
|
|
if(CollectionUtil.isNotEmpty(receiverList) && BeanUtils.isProd()){
|
|
|
// String templateParas_repair = "[\"C-001\",\"1号车间\",\"熊超\"]";
|
|
|
String no = sb.getNo();
|