From 0d63b433ce224c6e60bcefc334e7ed853c307692 Mon Sep 17 00:00:00 2001
From: none <none>
Date: Tue, 14 Mar 2023 17:24:51 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=20=E9=83=A8=E9=97=A8=E5=92=8C=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=88=86=E7=B1=BB=E7=9A=84=E4=B8=8A=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/request/backend/DepartmentParentRequest.java |  2 ++
 .../backend/ResourceCategoryParentRequest.java       |  2 ++
 .../api/service/impl/DepartmentServiceImpl.java      | 12 ++----------
 .../service/impl/ResourceCategoryServiceImpl.java    | 12 ++----------
 4 files changed, 8 insertions(+), 20 deletions(-)

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<DepartmentMapper, Departm
     @Override
     @Transactional
     public void changeParent(Integer id, Integer parentId, List<Integer> 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<ResourceCategoryMap
     @Override
     @Transactional
     public void changeParent(Integer id, Integer parentId, List<Integer> 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);
     }