修复邮件搜索接收人字段匹配错误导致无法查询到数据的问题

src/main/java/com/zq/email/controller/EmailManageController.java

@@ -48,7 +48,10 @@ public class EmailManageController {
     @PostMapping("total")
     @PostMapping("total")
     public ResultVo total(@RequestBody EmailSearchReqVo vo) {
     public ResultVo total(@RequestBody EmailSearchReqVo vo) {
         vo.setFolderId(EmailFolderEnum.FOLDER_ALREADY_SEND.getKey());
         vo.setFolderId(EmailFolderEnum.FOLDER_ALREADY_SEND.getKey());
+        if(null == vo.getSendUserId() && null == vo.getReceiveUserId()){
             AssertUtils.notNull(vo.getSendUserId(), "缺少参数：sendUserId");
             AssertUtils.notNull(vo.getSendUserId(), "缺少参数：sendUserId");
+            AssertUtils.notNull(vo.getReceiveUserId(), "缺少参数：receiveUserId");
+        }
         return ResultVo.success(emailPersonService.emailManageCount(vo));
         return ResultVo.success(emailPersonService.emailManageCount(vo));
     }
     }
 
 
@@ -56,7 +59,10 @@ public class EmailManageController {
     @PostMapping("page")
     @PostMapping("page")
     public ResultVo page(@RequestBody EmailSearchReqVo vo) {
     public ResultVo page(@RequestBody EmailSearchReqVo vo) {
         vo.setFolderId(EmailFolderEnum.FOLDER_ALREADY_SEND.getKey());
         vo.setFolderId(EmailFolderEnum.FOLDER_ALREADY_SEND.getKey());
+        if(null == vo.getSendUserId() && null == vo.getReceiveUserId()){
             AssertUtils.notNull(vo.getSendUserId(), "缺少参数：sendUserId");
             AssertUtils.notNull(vo.getSendUserId(), "缺少参数：sendUserId");
+            AssertUtils.notNull(vo.getReceiveUserId(), "缺少参数：receiveUserId");
+        }
         return ResultVo.success(emailPersonService.emailManagePage(vo));
         return ResultVo.success(emailPersonService.emailManagePage(vo));
     }
     }
 
 

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

@@ -302,9 +302,9 @@ public class EmailAttachServiceImpl extends ServiceImpl<EmailAttachMapper, Email
         String download = emailAttach.getDownloadPath();
         String download = emailAttach.getDownloadPath();
         byte[] bytes = null;
         byte[] bytes = null;
         if (profile.equals("wanpro") || profile.equals("wantest")) {
         if (profile.equals("wanpro") || profile.equals("wantest")) {
-            download = download.replaceAll("147.2.3.3", "172.28.1.71");
+            download = download.replaceAll("147.2.3.2", "172.28.1.71");
         }else{
         }else{
-            download = download.replaceAll("172.28.1.71", "147.2.3.3");
+            download = download.replaceAll("172.28.1.71", "147.2.3.2");
         }
         }
         try {
         try {
             bytes = HttpUtil.downloadBytes(download);
             bytes = HttpUtil.downloadBytes(download);

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

@@ -174,7 +174,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
 
 
     @Override
     @Override
     public Integer emailManageCount(EmailSearchReqVo vo) {
     public Integer emailManageCount(EmailSearchReqVo vo) {
-        vo.setUserId(vo.getSendUserId());
+//        vo.setUserId(vo.getSendUserId());
         vo.setPersonType(EmailConstant.TYPE_EMAIL_SEND);
         vo.setPersonType(EmailConstant.TYPE_EMAIL_SEND);
         vo.setIsSend(WhetherEnum.YES.getKey());
         vo.setIsSend(WhetherEnum.YES.getKey());
         Integer total = this.baseMapper.selectSearchTotal(vo);
         Integer total = this.baseMapper.selectSearchTotal(vo);
@@ -184,7 +184,7 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
     @Override
     @Override
     public Page<EmailPerson> emailManagePage(EmailSearchReqVo vo) {
     public Page<EmailPerson> emailManagePage(EmailSearchReqVo vo) {
 
 
-        vo.setUserId(vo.getSendUserId());
+//        vo.setUserId(vo.getSendUserId());
         vo.setPersonType(EmailConstant.TYPE_EMAIL_SEND);
         vo.setPersonType(EmailConstant.TYPE_EMAIL_SEND);
         vo.setIsSend(WhetherEnum.YES.getKey());
         vo.setIsSend(WhetherEnum.YES.getKey());
 
 

src/main/resources/mapper/EmailPersonMapper.xml

@@ -51,7 +51,6 @@
                 "EMAIL_PERSON" EP2
                 "EMAIL_PERSON" EP2
                 WHERE
                 WHERE
                 EP2."PERSON_TYPE" = 2
                 EP2."PERSON_TYPE" = 2
-                AND EP2."IS_SEND" = 1
                 AND  EP2."USER_ID" = #{s.receiveUserId}
                 AND  EP2."USER_ID" = #{s.receiveUserId}
                 )
                 )
             </if>
             </if>
@@ -143,7 +142,6 @@
                     "EMAIL_PERSON" EP2
                     "EMAIL_PERSON" EP2
                     WHERE
                     WHERE
                         EP2."PERSON_TYPE" = 2
                         EP2."PERSON_TYPE" = 2
-                        AND EP2."IS_SEND" = 1
                         AND  EP2."USER_ID" = #{s.receiveUserId}
                         AND  EP2."USER_ID" = #{s.receiveUserId}
                     )
                     )
                 </if>
                 </if>