fix：修复会员列表查询分页问题、标签查询问题

fs-company-app/src/main/java/com/fs/app/controller/FsUserController.java

@@ -82,9 +82,9 @@ public class FsUserController extends AppBaseController {
     public ResponseResult<PageInfo<FsUserPageListVO>> pageList(@RequestBody FsUserPageListParam param) {
         param.setUserId(Long.parseLong(getUserId()));
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        List<FsUserPageListVO> list = fsUserService.selectFsUserPageList(param);
-        PageInfo<FsUserPageListVO> pageInfo = new PageInfo<>(list);
-        return ResponseResult.ok(pageInfo);
+        PageInfo<FsUserPageListVO> fsUserPageListVOPageInfo = fsUserService.selectFsUserPageList(param);
+//        PageInfo<FsUserPageListVO> pageInfo = new PageInfo<>(list);
+        return ResponseResult.ok(fsUserPageListVOPageInfo);
     }
 
     @Login

fs-company/src/main/java/com/fs/users/controller/FsUserController.java

@@ -15,12 +15,16 @@ import com.fs.store.param.h5.FsUserPageListParam;
 import com.fs.store.service.IFsUserService;
 import com.fs.store.vo.FsCompanyUserListQueryVO;
 import com.fs.store.vo.h5.FsUserPageListVO;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户Controller
@@ -125,12 +129,16 @@ public class FsUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('users:user:darkRoomList')")
     @GetMapping("/darkRoomList")
     @ApiOperation("小黑屋")
-    public TableDataInfo darkRoomList(FsUserPageListParam param) {
+    public R darkRoomList(FsUserPageListParam param) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setUserId(loginUser.getUser().getUserId());
-        startPage();
-        List<FsUserPageListVO> list = fsUserService.selectFsUserPageList(param);
-        return getDataTable(list);
+//        startPage();
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        PageInfo<FsUserPageListVO> fsUserPageListVOPageInfo = fsUserService.selectFsUserPageList(param);
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("rows", fsUserPageListVOPageInfo.getList());
+        map.put("total", fsUserPageListVOPageInfo.getList().size());
+        return R.ok(map);
     }
 
     @PreAuthorize("@ss.hasPermi('users:user:enabledUsers')")

fs-service-system/src/main/java/com/fs/store/service/IFsUserService.java

@@ -20,6 +20,7 @@ import com.fs.store.vo.FSUserVO;
 import com.fs.store.vo.FsCompanyUserListQueryVO;
 import com.fs.store.vo.FsUserTuiVO;
 import com.fs.store.vo.h5.*;
+import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -137,7 +138,7 @@ public interface IFsUserService
 
     List<FsUser> getUserListLimit(FsUser fsUser);
 
-    List<FsUserPageListVO> selectFsUserPageList(FsUserPageListParam param);
+    PageInfo<FsUserPageListVO> selectFsUserPageList(FsUserPageListParam param);
     TableDataInfo selectFsUserPageListNew(FsUserPageListParam param);
     Long selectFsUserCount(FsUserPageListParam param);
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -54,6 +54,7 @@ import com.fs.store.vo.FSUserVO;
 import com.fs.store.vo.FsCompanyUserListQueryVO;
 import com.fs.store.vo.FsUserTuiVO;
 import com.fs.store.vo.h5.*;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.http.util.Asserts;
@@ -465,7 +466,7 @@ public class FsUserServiceImpl implements IFsUserService
     }
 
     @Override
-    public List<FsUserPageListVO> selectFsUserPageList(FsUserPageListParam param) {
+    public PageInfo<FsUserPageListVO> selectFsUserPageList(FsUserPageListParam param) {
         List<FsUserPageListVO> fsUserPageListVOS = fsUserMapper.selectFsUserPageList(param);
 
         // 获取当前销售所有重粉会员
@@ -477,18 +478,18 @@ public class FsUserServiceImpl implements IFsUserService
             List<FsUserCompanyUser> repeatCompanyUserNames = fsUserCompanyUserMapper.selectRepeatCompanyUserName(userIds);
             Map<Long, String> map = repeatCompanyUserNames.stream().collect(Collectors.toMap(FsUserCompanyUser::getUserId, FsUserCompanyUser::getRepeatCompanyUserName));
 
-            return fsUserPageListVOS.stream().map(v -> {
+            fsUserPageListVOS.stream().map(v -> {
                 FsUserPageListVO fsUserPageListVO = new FsUserPageListVO();
                 BeanUtils.copyProperties(v, fsUserPageListVO);
                 fsUserPageListVO.setRepeatCompanyUserName(map.get(v.getUserId()));
-                if("微信用户".equals(v.getNickname()) && StringUtils.isNotEmpty(v.getPhone())){
+                if ("微信用户".equals(v.getNickname()) && StringUtils.isNotEmpty(v.getPhone())) {
                     fsUserPageListVO.setNickname(v.getPhone());
                 }
                 return fsUserPageListVO;
             }).collect(Collectors.toList());
-
+            return new PageInfo<>(fsUserPageListVOS);
         } else {
-            return fsUserPageListVOS;
+            return new PageInfo<>(fsUserPageListVOS);
         }
     }
 

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -545,7 +545,7 @@
         <if test="tagIds != null and tagIds.length > 0">
             AND
             <foreach collection="tagIds" item="item" index="index" open="(" separator="or" close=")">
-                company_tag_user.tag_ids LIKE concat('%"',#{item},'"%')
+                CONCAT(',', company_tag_user.tag_ids, ',') LIKE CONCAT('%,', #{item}, ',%')
             </foreach>
         </if>
         <if test="tabValue != null and tabValue !='' ">