|
@@ -48,7 +48,7 @@ public class PackageController extends BaseController {
|
|
|
//@PreAuthorize("hasRole('ADMIN')")
|
|
//@PreAuthorize("hasRole('ADMIN')")
|
|
|
@PostMapping("/all")
|
|
@PostMapping("/all")
|
|
|
public Page<Package> all(@RequestBody PageQuery pageQuery) {
|
|
public Page<Package> all(@RequestBody PageQuery pageQuery) {
|
|
|
- pageQuery.setSort("type,asc");
|
|
|
|
|
|
|
+// pageQuery.setSort("type,asc");
|
|
|
Map<Long, String> categoryMap = categoryRepo.findAll()
|
|
Map<Long, String> categoryMap = categoryRepo.findAll()
|
|
|
.stream()
|
|
.stream()
|
|
|
.collect(Collectors.toMap(Category::getId, Category::getName));
|
|
.collect(Collectors.toMap(Category::getId, Category::getName));
|