Commit e29f89de by chentianzhong

撤回

parent f00b9e36
......@@ -488,9 +488,9 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
.eq(EmailPerson::getPersonType, EmailConstant.TYPE_EMAIL_RECEIVE).list();
AssertUtils.isTrue(CollectionUtil.isEmpty(list), "邮件已被收件人已读,无法撤回");
List<EmailPerson> personList = this.lambdaQuery().eq(EmailPerson::getEmailContentId, contentId)
.eq(EmailPerson::getIsRead, WhetherEnum.NO.getKey())
.eq(EmailPerson::getPersonType, EmailConstant.TYPE_EMAIL_RECEIVE).list();
// List<EmailPerson> personList = this.lambdaQuery().eq(EmailPerson::getEmailContentId, contentId)
// .eq(EmailPerson::getIsRead, WhetherEnum.NO.getKey())
// .eq(EmailPerson::getPersonType, EmailConstant.TYPE_EMAIL_RECEIVE).list();
//删除收件人
// if (CollectionUtil.isNotEmpty(personList)){
// this.removeByIds(personList);
......@@ -507,6 +507,11 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
.eq(EmailPerson::getPersonType, EmailConstant.TYPE_EMAIL_SEND)
.set(EmailPerson::getFolderId, EmailFolderEnum.FOLDER_OUTBOX.getKey())
.set(EmailPerson::getIsSend, WhetherEnum.NO.getKey()).update();
//将收件人设置未发送
this.lambdaUpdate()
.eq(EmailPerson::getEmailContentId, contentId)
.eq(EmailPerson::getPersonType, EmailConstant.TYPE_EMAIL_RECEIVE)
.set(EmailPerson::getIsSend, WhetherEnum.NO.getKey()).update();
msgUtil.revokeMsgByBusinessId(contentId);
}
......
......@@ -8,8 +8,8 @@
<contextName>logback</contextName>
<!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
<!-- <property name="log.path" value="/opt/oa-cloud/email/logs/"/>-->
<property name="log.path" value="/opt/services/oa-new/email/logs/"/>
<property name="log.path" value="/opt/oa-cloud/email/logs/"/>
<!-- <property name="log.path" value="/opt/services/oa-new/email/logs/"/>-->
<!-- <property name="log.path" value="D:/seallog/"/>-->
<!--主要日志文件名-->
......
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