Commit 3c23eb32 by jx-art

判断BUG修改~

parent 04da95c0
Pipeline #43228 passed with stages
in 1 minute 30 seconds
...@@ -16,6 +16,7 @@ import java.io.File; ...@@ -16,6 +16,7 @@ import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
...@@ -43,7 +44,7 @@ public class EmailServiceImpl implements IEmailService { ...@@ -43,7 +44,7 @@ public class EmailServiceImpl implements IEmailService {
} }
String subject = factor.getSubject(); String subject = factor.getSubject();
//标题参数处理 //标题参数处理
if (subjectParams != null || subjectParams.size() != 0){ if (subjectParams != null){
subject = String.format(subject,subjectParams.toArray()); subject = String.format(subject,subjectParams.toArray());
} }
uasClient.sendEmail(subject, content, toList, ccList, null); uasClient.sendEmail(subject, content, toList, ccList, null);
......
...@@ -131,7 +131,7 @@ public class ChangeConfigController { ...@@ -131,7 +131,7 @@ public class ChangeConfigController {
map.put("restsChangeCommander","转交后责任人名称"); map.put("restsChangeCommander","转交后责任人名称");
map.put("restsChangeCommanderEmail","转交后责任人邮箱"); map.put("restsChangeCommanderEmail","转交后责任人邮箱");
emailFactor.setData(map); emailFactor.setData(map);
iEmailService.sendEmail(strings,null,emailFactor,null); iEmailService.sendEmail(strings,null,emailFactor,list);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment