消息提醒

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/RectifyMsgServiceImpl.java

@@ -65,14 +65,19 @@ public class RectifyMsgServiceImpl extends BaseService<RectifyMsgDto,RectifyMsg,
      */
     @BusinessIdentify
     public List<MsgNoticeDto> msgNotice(Boolean isRead){
+
         LambdaQueryWrapper<InstallNoticeMsg> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(InstallNoticeMsg::getTargetPersonId,orgService.getReginParams().getBusinessInfo().getUserSequenceNbr())
-                .eq(InstallNoticeMsg::getIsRead,isRead)
                 .orderByDesc(InstallNoticeMsg::getSendTime);
+        if(!ValidationUtil.isEmpty(isRead)){
+            wrapper.eq(InstallNoticeMsg::getIsRead,isRead);
+        }
         LambdaQueryWrapper<RectifyMsg> wrapper1 = new LambdaQueryWrapper<>();
         wrapper1.eq(RectifyMsg::getMsgReceiver,orgService.getReginParams().getBusinessInfo().getUserSequenceNbr())
-                .eq(RectifyMsg::getIsRead,isRead)
                 .orderByDesc(RectifyMsg::getSendTime);
+        if(!ValidationUtil.isEmpty(isRead)){
+            wrapper1.eq(RectifyMsg::getIsRead,isRead);
+        }
         List<RectifyMsg> rectifyMsgList = rectifyMsgMapper.selectList(wrapper1);
         List<InstallNoticeMsg> installNoticeMsgList = installNoticeMsgMapper.selectList(wrapper);
         List<MsgNoticeDto> msgNoticeDtoList = new ArrayList<>();