|
|
@@ -52,6 +52,9 @@ public class ShowroomController extends BaseController {
|
|
|
|
|
|
@PostMapping("/all")
|
|
|
public Page<Showroom> all(@RequestBody PageQuery pageQuery) {
|
|
|
+ if (Objects.equals(pageQuery.getQuery().get("type"), "COMPANY")) {
|
|
|
+ pageQuery.getQuery().put("type", "COMPANY,COMPANY_BOX");
|
|
|
+ }
|
|
|
Page<Showroom> all = showroomService.all(pageQuery);
|
|
|
List<Long> ids = all.map(Showroom::getId).getContent();
|
|
|
Map<Long, List<ShowCollection>> collect = showCollectionRepo.findAllByShowroomIdIn(ids)
|
