88888

src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java

@@ -224,10 +224,13 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
                 .le(EmailPerson::getSendTime, LocalDateTime.now())
                 .in(EmailPerson::getId, vo.getPersonIdList()).list();
         for (EmailPerson emailPerson : personList) {
-            emailPerson.setOldFolderId(emailPerson.getFolderId());
-            emailPerson.setFolderId(vo.getFolderId());
+            Long folderId = emailPerson.getFolderId();
+            LocalDateTime sendTime = emailPerson.getSendTime();
+            this.lambdaUpdate().eq(EmailPerson::getSendTime, sendTime)
+                    .eq(EmailPerson::getId, emailPerson.getId())
+                    .set(EmailPerson::getFolderId, vo.getFolderId())
+                    .set(EmailPerson::getOldFolderId, folderId).update();
         }
-        this.updateBatchById(personList);
     }
 
     @Override
@@ -384,8 +387,10 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
 
         if (type.equals(WhetherEnum.YES.getKey())){   //下
             queryWrapper.lt(EmailPerson::getSendTime,  currentPerson.getSendTime());
+            queryWrapper.ge(EmailPerson::getSendTime,  currentPerson.getSendTime().plusMonths(6));
             queryWrapper.orderByDesc(EmailPerson::getSendTime);
         }else if (type.equals(WhetherEnum.NO.getKey())){  //上
+            queryWrapper.lt(EmailPerson::getSendTime,  currentPerson.getSendTime().plusMonths(-6));
             queryWrapper.gt(EmailPerson::getSendTime,  currentPerson.getSendTime());
             queryWrapper.orderByAsc(EmailPerson::getSendTime);
         }else{