|
@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
|
|
|
import java.net.URLEncoder;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
+import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -98,15 +99,17 @@ public class DingService {
|
|
|
if(dingConfig == null){
|
|
|
throw new BusinessException(ResultCode.DING_CONFIG_EMPTY);
|
|
|
}
|
|
|
- List<String> phones = new ArrayList<>();
|
|
|
+ HashSet<String> phones = new HashSet<>();
|
|
|
|
|
|
OaData oaData = getOaData(repairLog);
|
|
|
- Long sysUserId = oaData.getSysUserId();
|
|
|
- SysUser sysUser = sysUserService.getById(sysUserId);
|
|
|
- if(StringUtils.isNotBlank(sysUser.getDingAccount())){
|
|
|
- phones.add(sysUser.getDingAccount());
|
|
|
-
|
|
|
+ if(oaData.getSysUserId() != null){
|
|
|
+ Long sysUserId = oaData.getSysUserId();
|
|
|
+ SysUser sysUser = sysUserService.getById(sysUserId);
|
|
|
+ if(sysUser!= null && StringUtils.isNotBlank(sysUser.getDingAccount())){
|
|
|
+ phones.add(sysUser.getDingAccount());
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
if(repairLog.getRepairStatus().equals(RepairStatusProcessComing.TO_BE_U8SEND.getStatus())){
|
|
|
List<SysUser> userList = sysUserService.getByRoleType(6); //u8
|
|
|
for (SysUser user : userList) {
|