admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-04-13 15:56:34 +08:00
parent efcbf32425
commit 8f4d1c2022
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java
View File

@ -145,6 +145,11 @@ public class XzRegistryServiceImpl extends ServiceImpl<XzRegistryMapper, XzRegis
//2审批通过3拒绝申请 //2审批通过3拒绝申请
try { try {
if (Objects.equals(approvalProcess, 2)) { if (Objects.equals(approvalProcess, 2)) {
SystemUser su = systemUserMapper.selectOne(new LambdaQueryWrapper<SystemUser>()
.eq(SystemUser::getAccount, xz.getAccount()));
if (su != null) {
return;
}
String projectSns = r.getProjectSns(); String projectSns = r.getProjectSns();
String companySns = r.getCompanySns(); String companySns = r.getCompanySns();
if (StringUtils.isBlank(projectSns) && StringUtils.isBlank(companySns)) { if (StringUtils.isBlank(projectSns) && StringUtils.isBlank(companySns)) {

31
src/main/java/com/zhgd/xmgl/util/EmailUtils.java
View File

@ -7,9 +7,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.FileSystemResource;
import org.springframework.mail.MailException;
import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.SimpleMailMessage;
import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.mail.internet.InternetAddress; import javax.mail.internet.InternetAddress;
@ -44,20 +46,25 @@ public class EmailUtils implements EmailService {
* @param content 内容 * @param content 内容
*/ */
@Override @Override
@Async
public void sendSimpleMail(String to, String subject, String content) { public void sendSimpleMail(String to, String subject, String content) {
log.info("发送邮件，收件人：{}，主题：{}，内容：{}", to, subject, content); log.info("发送邮件，收件人：{}，主题：{}，内容：{}", to, subject, content);
//创建SimpleMailMessage对象 try {
SimpleMailMessage message = new SimpleMailMessage(); //创建SimpleMailMessage对象
//邮件发送人 SimpleMailMessage message = new SimpleMailMessage();
message.setFrom(from); //邮件发送人
//邮件接收人 message.setFrom(from);
message.setTo(to); //邮件接收人
//邮件主题 message.setTo(to);
message.setSubject(subject); //邮件主题
//邮件内容 message.setSubject(subject);
message.setText(content); //邮件内容
//发送邮件 message.setText(content);
mailSender.send(message); //发送邮件
mailSender.send(message);
} catch (MailException e) {
log.error("发送邮件error", e);
}
} }
/** /**