群聊

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/ImGroupMemberController.java

@@ -64,8 +64,8 @@ public class ImGroupMemberController extends BaseController {
         }
         Object search = params.get("search");
         List<ImGroupMember> iPage = imGroupMemberService.getBaseMapper().selectList(Wrappers.<ImGroupMember>query().lambda()
-                .or(Objects.nonNull(search) && StringUtils.isNotEmpty(search.toString()),
-                        e->e.eq(ImGroupMember::getUserId, search)
+                .and(Objects.nonNull(search) && StringUtils.isNotEmpty(search.toString()),
+                        e->e.eq(ImGroupMember::getUserId, search).or()
                         .like(ImGroupMember::getNickname, search))
                 .eq(ImGroupMember::getGroupId,params.get("groupId")).orderByDesc(ImGroupMember::getId));
         return succeed(iPage);

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/ImGroupNoticeController.java

@@ -1,12 +1,8 @@
 package com.yonge.cooleshow.student.controller;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yonge.cooleshow.biz.dal.entity.ImGroupNotice;
 import com.yonge.cooleshow.biz.dal.service.ImGroupNoticeService;
-import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -44,11 +40,7 @@ public class ImGroupNoticeController extends BaseController {
     @ApiOperation("分页查询")
     @PostMapping(value = "/queryPage")
     public HttpResponseResult<PageInfo<ImGroupNotice>> queryPage(@RequestBody Map<String,Object> params) throws Exception {
-        Page<ImGroupNotice> pageInfo = PageUtil.getPageInfo(params);
-        IPage<ImGroupNotice> iPage = imGroupNoticeService.getBaseMapper().selectPage(pageInfo, Wrappers.<ImGroupNotice>query().lambda()
-                .eq(ImGroupNotice::getGroupId,params.get("groupId"))
-                .orderByDesc(ImGroupNotice::getCreateTime));
-        return succeed(PageUtil.pageInfo(iPage));
+        return succeed(imGroupNoticeService.queryPage(params));
     }
 }
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/ImUserFriendController.java

@@ -44,8 +44,8 @@ public class ImUserFriendController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         Object search = params.get("search");
         List<ImUserFriend> iPage = imUserFriendService.getBaseMapper().selectList(Wrappers.<ImUserFriend>query().lambda()
-                .or(Objects.nonNull(search) && StringUtils.isNotEmpty(search.toString()),
-                        e->e.eq(ImUserFriend::getFriendId, search)
+                .and(Objects.nonNull(search) && StringUtils.isNotEmpty(search.toString()),
+                        e->e.eq(ImUserFriend::getFriendId, search).or()
                         .like(ImUserFriend::getFriendNickname, search))
                 .eq(ImUserFriend::getUserId,sysUser.getId()).orderByDesc(ImUserFriend::getId));
         return succeed(iPage);

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupMemberController.java

@@ -65,8 +65,8 @@ public class ImGroupMemberController extends BaseController {
         }
         Object search = params.get("search");
         List<ImGroupMember> iPage = imGroupMemberService.list(new QueryWrapper<ImGroupMember>().lambda()
-                .or(Objects.nonNull(search) && StringUtils.isNotEmpty(search.toString()),e->e.
-                        eq(ImGroupMember::getUserId, search)
+                .and(Objects.nonNull(search) && StringUtils.isNotEmpty(search.toString()),e->e.
+                        eq(ImGroupMember::getUserId, search).or()
                         .like(ImGroupMember::getNickname, search))
                 .eq(ImGroupMember::getGroupId,params.get("groupId")).orderByDesc(ImGroupMember::getId));
         return succeed(iPage);