diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/UserService.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/UserService.java index b18ae21..6fca793 100644 --- a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/UserService.java +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/UserService.java @@ -13,6 +13,7 @@ import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; @Service public class UserService extends ServiceImpl { @@ -23,7 +24,13 @@ public class UserService extends ServiceImpl { public UserPage findUserByUserName(String userName, Integer current, Integer size){ IPage page = new Page<>(current, size); - IPage users = baseMapper.selectPage(page, new QueryWrapper().like("user_name",userName)); + IPage users; + if (Objects.nonNull(userName) && !"".equals(userName)){ + users = baseMapper.selectPage(page, new QueryWrapper().like("user_name",userName)); + }else { + users = baseMapper.selectPage(page, new QueryWrapper().orderByDesc("user_registration_date")); + } + UserPage userPage = new UserPage(); userPage.setCurrent(users.getCurrent()); userPage.setSize(users.getSize()); diff --git a/04.系统编码/Frontend/.idea/workspace.xml b/04.系统编码/Frontend/.idea/workspace.xml index 2445d01..36f7437 100644 --- a/04.系统编码/Frontend/.idea/workspace.xml +++ b/04.系统编码/Frontend/.idea/workspace.xml @@ -4,6 +4,7 @@ +