diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppApiController.java b/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppApiController.java index 16a6852..d3ac0db 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppApiController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppApiController.java @@ -1034,7 +1034,7 @@ public class AppApiController { .eq(TenRelation::getParentId,user.getUserId()) .in(TenRelation::getStudentId,list)); relations.forEach(relation -> { - info.put("objectUuid",relation.getId()); + info.put("objectUuid",relation.getId().toString()); dataInfo.add(info); }); opParams.put("dataInfo",dataInfo); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenParentController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenParentController.java index db0b501..56f5781 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenParentController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenParentController.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @RestController @RequestMapping("ten/parent") @@ -78,7 +79,11 @@ public class TenParentController { Map info = new HashMap<>(); params.forEach(item -> { TenParent tenParent = tenParentService.getById(item.get("id")); - info.put("objectUuid",tenParent.getUserId().toString()); + List relations = relationService.list(new LambdaQueryWrapper().eq(TenRelation::getParentId,tenParent.getUserId())); + List ids = relations.stream().map(TenRelation::getId).collect(Collectors.toList()); + ids.stream().forEach(id -> { + info.put("objectUuid",id.toString()); + }); dataInfo.add(info); tenParentService.removeById(item.get("id")); appUserService.removeById(tenParent.getUserId()); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRelationController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRelationController.java index cb35ca6..cd3d638 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRelationController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRelationController.java @@ -72,7 +72,7 @@ public class TenRelationController extends AbstractController { opParams.put("empowerText",KeysEntity.empowerText); List> dataInfo = new ArrayList<>(); Map info = new HashMap<>(); - info.put("objectUuid",tenRelation.getId()); + info.put("objectUuid",tenRelation.getId().toString()); info.put("userUuid",tenRelation.getStudentId().toString()); info.put("salutation",tenRelation.getRelation()); info.put("phoneNumber",appUser.getMobile());