diff --git a/src/main/java/xyz/playedu/api/request/backend/DepartmentParentRequest.java b/src/main/java/xyz/playedu/api/request/backend/DepartmentParentRequest.java index 16833d4..d92d67f 100644 --- a/src/main/java/xyz/playedu/api/request/backend/DepartmentParentRequest.java +++ b/src/main/java/xyz/playedu/api/request/backend/DepartmentParentRequest.java @@ -1,5 +1,6 @@ package xyz.playedu.api.request.backend; +import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -18,5 +19,6 @@ public class DepartmentParentRequest { private Integer id; @NotNull(message = "参数为空") + @JsonProperty("parent_id") private Integer parentId; } diff --git a/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryParentRequest.java b/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryParentRequest.java index 564423d..1acb4cf 100644 --- a/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryParentRequest.java +++ b/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryParentRequest.java @@ -1,5 +1,6 @@ package xyz.playedu.api.request.backend; +import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -18,5 +19,6 @@ public class ResourceCategoryParentRequest { private Integer id; @NotNull(message = "参数为空") + @JsonProperty("parent_id") private Integer parentId; } diff --git a/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java index a613e17..6065289 100644 --- a/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java @@ -197,16 +197,8 @@ public class DepartmentServiceImpl extends ServiceImpl ids) throws NotFoundException { - Department department = new Department(); - department.setId(id); - department.setParentId(parentId); - if (parentId.equals(0)) { - department.setParentChain(""); - } else { - Department parentDep = findOrFail(parentId); - department.setParentChain(childrenParentChain(parentDep)); - } - + Department department = findOrFail(id); + update(department, department.getName(), parentId, department.getSort()); // 重置排序 resetSort(ids); } diff --git a/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java index c0f232d..d60c4f4 100644 --- a/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java @@ -197,16 +197,8 @@ public class ResourceCategoryServiceImpl extends ServiceImpl ids) throws NotFoundException { - ResourceCategory category = new ResourceCategory(); - category.setId(id); - category.setParentId(parentId); - if (parentId.equals(0)) { - category.setParentChain(""); - } else { - ResourceCategory parentResourceCategory = findOrFail(parentId); - category.setParentChain(childrenParentChain(parentResourceCategory)); - } - + ResourceCategory category = findOrFail(id); + update(category, category.getName(), parentId, category.getSort()); // 重置排序 resetSort(ids); }