|
@@ -391,7 +391,9 @@ public class UserController extends SuperCacheController<UserService, Long, User
|
|
|
.eq(userPage.getNation() != null && StrUtil.isNotEmpty(userPage.getNation().getKey()), User::getNation, userPage.getNation())
|
|
|
.eq(User::getSex, userPage.getSex())
|
|
|
.eq(User::getReadonly, false)
|
|
|
- .eq(User::getStatus, userPage.getStatus());
|
|
|
+ .eq(User::getStatus, userPage.getStatus())
|
|
|
+ .orderByAsc(User::getAccount)
|
|
|
+ .orderByAsc(User::getName);
|
|
|
baseService.findPage(page, wrapper);
|
|
|
}
|
|
|
|