mirror of
https://git.imnavajas.es/jjimenez/erp-imprimelibros.git
synced 2026-02-27 21:29:13 +00:00
Merge branch 'mod/order_user_select_by_name' into 'main'
hecho See merge request jjimenez/erp-imprimelibros!45
This commit is contained in:
@ -29,6 +29,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
|
|||||||
|
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.domain.Sort;
|
||||||
|
|
||||||
import com.imprimelibros.erp.datatables.DataTablesRequest;
|
import com.imprimelibros.erp.datatables.DataTablesRequest;
|
||||||
import com.imprimelibros.erp.datatables.DataTablesParser;
|
import com.imprimelibros.erp.datatables.DataTablesParser;
|
||||||
@ -377,7 +378,7 @@ public class UserController {
|
|||||||
@RequestParam(defaultValue = "1") int page,
|
@RequestParam(defaultValue = "1") int page,
|
||||||
@RequestParam(defaultValue = "10") int size) {
|
@RequestParam(defaultValue = "10") int size) {
|
||||||
|
|
||||||
Pageable pageable = PageRequest.of(Math.max(0, page - 1), size);
|
Pageable pageable = PageRequest.of(Math.max(0, page - 1), size, Sort.by(Sort.Direction.ASC, "fullName"));
|
||||||
|
|
||||||
Page<User> users = userService.findByRoleAndSearch(role, q, pageable);
|
Page<User> users = userService.findByRoleAndSearch(role, q, pageable);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user