From ba67e3650d0b6b7bed7d8f92fa2bf4289024ea37 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Sat, 6 Nov 2021 15:37:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E6=9D=BF=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skyeye/eve/service/impl/EmailSendModelServiceImpl.java | 1 +
 .../main/resources/mapper/email/EmailSendModelMapper.xml   | 7 +++++--
 .../skyeye/mq/job/impl/ComplexMailDeliveryServiceImpl.java | 1 -
 .../com/skyeye/service/impl/JobMateMationServiceImpl.java  | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/skyeye-email/src/main/java/com/skyeye/eve/service/impl/EmailSendModelServiceImpl.java b/skyeye-email/src/main/java/com/skyeye/eve/service/impl/EmailSendModelServiceImpl.java
index d164acfb5..dc85c550d 100644
--- a/skyeye-email/src/main/java/com/skyeye/eve/service/impl/EmailSendModelServiceImpl.java
+++ b/skyeye-email/src/main/java/com/skyeye/eve/service/impl/EmailSendModelServiceImpl.java
@@ -28,6 +28,7 @@ public class EmailSendModelServiceImpl implements EmailSendModelService {
     public void queryEmailSendModelList(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> inputParams = inputObject.getParams();
         Page pages = PageHelper.startPage(Integer.parseInt(inputParams.get("page").toString()), Integer.parseInt(inputParams.get("limit").toString()));
+        inputParams.put("userId", inputObject.getLogParams().get("id"));
         List<Map<String, Object>> emailSendModelList = emailSendModelDao.queryEmailSendModelList(inputParams);
         outputObject.setBeans(emailSendModelList);
         outputObject.settotal(pages.getTotal());
diff --git a/skyeye-email/src/main/resources/mapper/email/EmailSendModelMapper.xml b/skyeye-email/src/main/resources/mapper/email/EmailSendModelMapper.xml
index 7be03f454..23592062e 100644
--- a/skyeye-email/src/main/resources/mapper/email/EmailSendModelMapper.xml
+++ b/skyeye-email/src/main/resources/mapper/email/EmailSendModelMapper.xml
@@ -6,6 +6,9 @@
 		SELECT
 			esm.id,
 			esm.title,
+			esm.to_people toPeople,
+			IFNULL(esm.to_cc, '') toCc,
+			IFNULL(esm.to_bcc, '') toBcc,
 			b.user_name createName,
 			CONVERT(esm.create_time, char) createTime,
 			c.user_name lastUpdateName,
@@ -14,9 +17,9 @@
 		    email_send_model esm
 			LEFT JOIN sys_eve_user_staff b ON esm.create_id = b.user_id
 			LEFT JOIN sys_eve_user_staff c ON esm.last_update_id = c.user_id
-		WHERE 1 = 1
+		WHERE esm.create_id = #{userId}
 		<if test="title != null and title != ''">
-			AND esm.title = '%${title}%'
+			AND esm.title LIKE '%${title}%'
 		</if>
 		ORDER BY esm.create_time DESC
 	</select>
diff --git a/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/ComplexMailDeliveryServiceImpl.java b/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/ComplexMailDeliveryServiceImpl.java
index a158b6b93..a5e1f78db 100644
--- a/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/ComplexMailDeliveryServiceImpl.java
+++ b/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/ComplexMailDeliveryServiceImpl.java
@@ -50,7 +50,6 @@ public class ComplexMailDeliveryServiceImpl implements JobMateService {
 	@Autowired
 	private SystemFoundationSettingsService systemFoundationSettingsService;
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public void call(String data) throws Exception {
 		Map<String, Object> map = JSONUtil.toBean(data, null);
diff --git a/skyeye-mq/src/main/java/com/skyeye/service/impl/JobMateMationServiceImpl.java b/skyeye-mq/src/main/java/com/skyeye/service/impl/JobMateMationServiceImpl.java
index def3d774d..1091bd751 100644
--- a/skyeye-mq/src/main/java/com/skyeye/service/impl/JobMateMationServiceImpl.java
+++ b/skyeye-mq/src/main/java/com/skyeye/service/impl/JobMateMationServiceImpl.java
@@ -175,6 +175,7 @@ public class JobMateMationServiceImpl implements JobMateMationService {
 	private void sendJobResultMseeage(String jobId, String status) throws Exception{
 		Map<String, Object> jobMation = jobMateMationDao.queryJobMationByJobId(jobId);
 		String userId = jobMation.get("createId").toString();
+		LOGGER.info("job is success, jobId is {}", jobId);
 		if(MqConstants.JOB_TYPE_IS_SUCCESS.equals(status) || MqConstants.JOB_TYPE_IS_FAIL.equals(status)
 				|| MqConstants.JOB_TYPE_IS_PARTIAL_SUCCESS.equals(status)) {
 			// 成功/失败/部分成功
-- 
GitLab