diff --git a/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml index 5c02e0bb..990d106a 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml @@ -566,7 +566,8 @@ where id = #{id} a.status AS status, a.remark AS remark, a.create_time AS createTime, - a.modify_time AS modifyTime + a.modify_time AS modifyTime, + receiveApi.api_name AS receiveApiName FROM @@ -577,6 +578,7 @@ where id = #{id} LEFT JOIN sys_application sendApp ON a.send_app = sendApp.id AND sendApp.sts = 'Y' + LEFT JOIN sys_application_api receiveApi ON a.receive_code = receiveApi.api_code AND receiveApi.sts = 'Y' AND a.id in diff --git a/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/entity/SysSendMessageLogEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/entity/SysSendMessageLogEntity.xml index 5c80f848..b0e9b621 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/entity/SysSendMessageLogEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/entity/SysSendMessageLogEntity.xml @@ -62,7 +62,7 @@ from sys_send_message_log log LEFT JOIN sys_person p1 ON p1.id = log.recipients_person_id LEFT JOIN sys_person p2 ON p2.id = log.send_person_id - where log.id = #{ id } and log.sts='Y' + where log.id = #{ id } and log.sts='Y' and p1.sts='Y' and p2.sts='Y' @@ -129,6 +129,7 @@ and config.status like concat('%',#{status},'%') and config.recipient_id_list like concat('%',#{recipientIdList},'%') and config.sts='Y' + and template.sts='Y' order by config.sorts asc order by ${sort} ${order} diff --git a/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml index f22c6755..f43f9f82 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml @@ -130,6 +130,7 @@ and i.status like concat('%',#{status},'%') and i.warning_config_id like concat('%',#{warningConfigId},'%') and i.sts='Y' + and app.sts='Y' order by i.sorts asc order by ${sort} ${order}