diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java index a337e8a..49574e0 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -45,6 +46,8 @@ public class MessageListService extends MybatisBaseService listAll(MessageListQuery query) { QueryWrapper qw = createQueryWrapper(query); @@ -141,7 +144,7 @@ public class MessageListService extends MybatisBaseService noreadListPage(PagerQuery pq,String userSid) { + public PagerVo noreadListPage(PagerQuery pq, String userSid) { MessageListQuery query = pq.getParams(); query.setReceiverSid(userSid); QueryWrapper qw = createQueryWrapper(query); @@ -151,7 +154,7 @@ public class MessageListService extends MybatisBaseService readListPage(PagerQuery pq,String userSid) { + public PagerVo readListPage(PagerQuery pq, String userSid) { MessageListQuery query = pq.getParams(); query.setReceiverSid(userSid); QueryWrapper qw = createQueryWrapper(query); @@ -238,6 +241,7 @@ public class MessageListService extends MybatisBaseService getAppMsgListByUserSid(PagerQuery pq) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("ml.receiverSid", pq.getParams().getUserSid()); + qw.eq("ml.receiverSid", pq.getParams().getUserSid()); qw.eq("m.msgTypeSid", pq.getParams().getMsgTypeSid()); IPage iPage = PagerUtil.queryToPage(pq); IPage page = baseMapper.getAppMsgListByUserSid(iPage, qw); @@ -317,12 +325,13 @@ public class MessageListService extends MybatisBaseService