Commit 7687f7aa authored by suntao's avatar suntao

like

parent c5271f96
...@@ -334,7 +334,7 @@ public class UserServiceImpl implements UserService { ...@@ -334,7 +334,7 @@ public class UserServiceImpl implements UserService {
List<Predicate> predicates = new ArrayList<>(); List<Predicate> predicates = new ArrayList<>();
if (StringUtils.isNotEmpty(queryUserListModel.getNickname())) { if (StringUtils.isNotEmpty(queryUserListModel.getNickname())) {
predicates.add(criteriaBuilder.equal(root.get("nickname"), queryUserListModel.getNickname())); predicates.add(criteriaBuilder.like(root.get("nickname"), "%" + queryUserListModel.getNickname() + "%"));
} }
if (Objects.nonNull(queryUserListModel.getRoleId())) { if (Objects.nonNull(queryUserListModel.getRoleId())) {
predicates.add(criteriaBuilder.equal(root.get("role").get("id"), queryUserListModel.getRoleId())); predicates.add(criteriaBuilder.equal(root.get("role").get("id"), queryUserListModel.getRoleId()));
...@@ -346,12 +346,8 @@ public class UserServiceImpl implements UserService { ...@@ -346,12 +346,8 @@ public class UserServiceImpl implements UserService {
return criteriaQuery.getRestriction(); return criteriaQuery.getRestriction();
}, new PageRequest(queryUserListModel.getPageNumber(), queryUserListModel.getPageSize())); }, new PageRequest(queryUserListModel.getPageNumber(), queryUserListModel.getPageSize()));
// PageRequest pageRequest = new PageRequest(queryUserListModel.getPageNumber(), queryUserListModel.getPageSize(), new Sort(Sort.Direction.DESC, "id")); // PageRequest pageRequest = new PageRequest(queryUserListModel.getPageNumber(), queryUserListModel.getPageSize(), new Sort(Sort.Direction.DESC, "id"));
//
// Page<User> userPage = userRepository.getUserByNicknameAndRoleId(pageRequest); // Page<User> userPage = userRepository.getUserByNicknameAndRoleId(pageRequest);
return Result.buildSuccess(page); return Result.buildSuccess(page);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment