From 3c9b701f760a4a7b1f3ab51d3a8a7476cc7915b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=8F=E7=A5=A5?=
 <14281818+xue-hongxiang@user.noreply.gitee.com>
Date: Thu, 19 Dec 2024 17:12:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E4=BF=AE=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B3=E9=A2=86=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/business/contraller/MaintenanceController.java    | 4 ++--
 .../business/pojo/entity/MaintenanceTaskDetailGoods.java      | 2 +-
 .../business/service/impl/MaintenanceTaskServiceImpl.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
index 50727fe..94e15e5 100644
--- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
@@ -255,12 +255,12 @@ public class MaintenanceController extends BladeController {
         taskService.updateById(taskOld);
         List<MaintenanceTaskDetail> detailList = taskDto.getDetailList();
         for (MaintenanceTaskDetail maintenanceTaskDetail : detailList) {
-            Long deptId = maintenanceTaskDetail.getDeptId();
+            Long id = maintenanceTaskDetail.getId();
             Optional<List<MaintenanceTaskDetailGoods>> detailGoods = Optional.ofNullable(maintenanceTaskDetail.getDetailGoodsList());
             if (detailGoods.isPresent()) {
                 List<MaintenanceTaskDetailGoods> detailGoodsList = detailGoods.get();
                 for (MaintenanceTaskDetailGoods maintenanceTaskDetailGoods : detailGoodsList) {
-                    maintenanceTaskDetailGoods.setDeptId(deptId);
+                    maintenanceTaskDetailGoods.setParentId(id);
                     maintenanceApplyGoodsService.save(maintenanceTaskDetailGoods);
                 }
             } else {
diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java b/src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java
index 3b237b3..a0e00f7 100644
--- a/src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java
+++ b/src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java
@@ -35,7 +35,7 @@ public class MaintenanceTaskDetailGoods extends BaseEntity {
     //价格
     private Double price;
 
-    private Long deptId;
+    private Long parentId;
 
 
 }
diff --git a/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskServiceImpl.java
index 02b457d..a6a5214 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskServiceImpl.java
@@ -82,7 +82,7 @@ public class MaintenanceTaskServiceImpl extends BaseServiceImpl<MaintenanceTaskM
                 MaintenanceTaskDetail dept = new MaintenanceTaskDetail();
                 List<MaintenanceTaskDetail> maintenanceTaskDetailList = listEntry.getValue();
                 for (MaintenanceTaskDetail maintenanceTaskDetail : maintenanceTaskDetailList) {
-                    List<MaintenanceTaskDetailGoods> applyGoodsList = applyGoodsService.list(Wrappers.lambdaQuery(MaintenanceTaskDetailGoods.class).eq(MaintenanceTaskDetailGoods::getDeptId, maintenanceTaskDetail.getDeptId()));
+                    List<MaintenanceTaskDetailGoods> applyGoodsList = applyGoodsService.list(Wrappers.lambdaQuery(MaintenanceTaskDetailGoods.class).eq(MaintenanceTaskDetailGoods::getParentId, maintenanceTaskDetail.getId()));
                     maintenanceTaskDetail.setDetailGoodsList(applyGoodsList);
                 }
                 dept.setDeptName(listEntry.getKey());