|
@@ -453,9 +453,21 @@ public class OrderInfoService {
|
|
|
public Page<OrderInfo> children(PageQuery pageQuery) {
|
|
public Page<OrderInfo> children(PageQuery pageQuery) {
|
|
|
pageQuery.setSort("createdAt,desc");
|
|
pageQuery.setSort("createdAt,desc");
|
|
|
Map<String, Object> query = pageQuery.getQuery();
|
|
Map<String, Object> query = pageQuery.getQuery();
|
|
|
- String parent = (String) query.get("userId");
|
|
|
|
|
|
|
+// String parent = (String) query.get("userId");
|
|
|
|
|
+ Object userId = query.get("userId");
|
|
|
|
|
+ Long parent = 0L;
|
|
|
|
|
+ if (userId instanceof String) {
|
|
|
|
|
+ String of = String.valueOf(userId);
|
|
|
|
|
+ parent = Long.parseLong(of);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (userId instanceof Integer) {
|
|
|
|
|
+ Integer of = (Integer) userId;
|
|
|
|
|
+ parent = Long.valueOf(of);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
query.remove("userId");
|
|
query.remove("userId");
|
|
|
- List<Long> childrenId = userService.childrenId(Long.valueOf(parent));
|
|
|
|
|
|
|
+ List<Long> childrenId = userService.childrenId(parent);
|
|
|
|
|
|
|
|
return orderInfoRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
|
|
return orderInfoRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
|
|
|
List<Predicate> and = JpaUtils.toPredicates(pageQuery, OrderInfo.class, root, criteriaQuery, criteriaBuilder);
|
|
List<Predicate> and = JpaUtils.toPredicates(pageQuery, OrderInfo.class, root, criteriaQuery, criteriaBuilder);
|