-修改邮件内容

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/InvoiceEndFailListener.java

@@ -9,6 +9,7 @@ import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
 import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
 import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
 import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
@@ -44,7 +45,9 @@ public class InvoiceEndFailListener implements Serializable, ExecutionListener {
             String email = sysUserService.selectUserById(approveEntity.getUserId()).getEmail();
             String apNo = approveEntity.getApNo();
             logger.info("apNo:" + apNo);
-            String username = sysUserService.selectUserById(approveEntity.getUserId()).getNickName();
+            SysUser sysUser = sysUserService.selectUserById(approveEntity.getUserId());
+            String username = sysUser.getNickName();
+            String loginName = sysUser.getUserName();
             String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
             logger.info("email:" + email);
             logger.info("username:" + username);
@@ -58,8 +61,8 @@ public class InvoiceEndFailListener implements Serializable, ExecutionListener {
             String prime = "";
             String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
                     "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
-                    "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
-                    "Dear usernameEN</font></font></h2>" +
+                    "亲爱的 username(loginName)</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "Dear usernameEN(loginName)</font></font></h2>" +
                     "<p>您的申请已作废<br>" +
                     "Your application has been voided:<br>" +
                     "任务名：<b>预约开票审批流程</b><br>" +
@@ -75,7 +78,8 @@ public class InvoiceEndFailListener implements Serializable, ExecutionListener {
                     "</div></div></div></td></tr>";
             String one = center.replaceFirst("username", username);
             String two = one.replaceFirst("usernameEN", usernameEN);
-            String four = two.replaceFirst("apNo", apNo);
+            String three = two.replace("loginName", loginName);
+            String four = three.replaceFirst("apNo", apNo);
             String five = four.replaceFirst("apNoEN", apNo);
             String result = five.replaceFirst("date", String.valueOf(new Date()));
             prime = prime + result;

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/InvoiceEndSuccessListener.java

@@ -61,7 +61,9 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
             String email = sysUserService.selectUserById(approveEntity.getUserId()).getEmail();
             String apNo = approveEntity.getApNo();
             logger.info("apNo:" + apNo);
-            String username = sysUserService.selectUserById(approveEntity.getUserId()).getNickName();
+            SysUser sysUser = sysUserService.selectUserById(approveEntity.getUserId());
+            String username = sysUser.getNickName();
+            String loginName = sysUser.getUserName();
             String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
             logger.info("email:" + email);
             logger.info("username:" + username);
@@ -75,8 +77,8 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
             String prime = "";
             String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
                     "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
-                    "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
-                    "Dear usernameEN</font></font></h2>" +
+                    "亲爱的 username(loginName)</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "Dear usernameEN(loginName)</font></font></h2>" +
                     "<p>您的审批已完成<br>" +
                     "You have a new to-do task:<br>" +
                     "任务名：<b>预约开票审批流程</b><br>" +
@@ -92,7 +94,8 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
                     "</div></div></div></td></tr>";
             String one = center.replaceFirst("username", username);
             String two = one.replaceFirst("usernameEN", usernameEN);
-            String four = two.replaceFirst("apNo", apNo);
+            String three = two.replace("loginName", loginName);
+            String four = three.replaceFirst("apNo", apNo);
             String five = four.replaceFirst("apNoEN", apNo);
             String result = five.replaceFirst("date", String.valueOf(new Date()));
             prime = prime + result;