|
@@ -140,7 +140,13 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
|
|
|
|
|
|
|
|
public IPage<LifeUserVo> getStoreAndUserByName(LifeUserVo vo) {
|
|
public IPage<LifeUserVo> getStoreAndUserByName(LifeUserVo vo) {
|
|
|
QueryWrapper<LifeUserVo> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<LifeUserVo> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.like(StringUtils.isNotEmpty(vo.getSearchName()), "a.storeUserName", vo.getSearchName());
|
|
|
|
|
|
|
+ if (StringUtils.isNotEmpty(vo.getSearchName())) {
|
|
|
|
|
+ queryWrapper.and(wrapper -> wrapper
|
|
|
|
|
+ .like("a.storeUserName", vo.getSearchName())
|
|
|
|
|
+ .or()
|
|
|
|
|
+ .like("a.phoneId", vo.getSearchName())
|
|
|
|
|
+ );
|
|
|
|
|
+ }
|
|
|
IPage<LifeUserVo> voList = lifeUserMapper.getStoreAndUserByName(new Page<>(vo.getPage(), vo.getSize()), queryWrapper);
|
|
IPage<LifeUserVo> voList = lifeUserMapper.getStoreAndUserByName(new Page<>(vo.getPage(), vo.getSize()), queryWrapper);
|
|
|
|
|
|
|
|
// 查询我的关注
|
|
// 查询我的关注
|