From eded8e5c26238b8d136aba7a1fc19689dc7868b1 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Wed, 11 Dec 2024 16:41:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=9A=82=E6=97=B6=E5=85=88=E4=B8=8D=E8=B5=B0?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/repair/service/impl/RepairServiceImpl.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
index fef054ef..93b09538 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
@@ -617,7 +617,9 @@ public class RepairServiceImpl implements RepairService {
             repairMapper.updateRepairedNum(bean.getId(), innerRepairNum.add(outerRepairNum) , loginUser.getUserid(), loginUser.getUserid());
             repairMapper.updateScrapNum(bean.getId(), scrapNum, loginUser.getUserid());
         } else {
-            repairMapper.updateThisRepairedAndScrapNum(bean.getId(), innerRepairNum.add(outerRepairNum), scrapNum, loginUser.getUserid(), loginUser.getUserid());
+            repairMapper.updateRepairedNum(bean.getId(), innerRepairNum.add(outerRepairNum) , loginUser.getUserid(), loginUser.getUserid());
+            repairMapper.updateScrapNum(bean.getId(), scrapNum, loginUser.getUserid());
+//            repairMapper.updateThisRepairedAndScrapNum(bean.getId(), innerRepairNum.add(outerRepairNum), scrapNum, loginUser.getUserid(), loginUser.getUserid());
         }
     }
 
@@ -697,7 +699,7 @@ public class RepairServiceImpl implements RepairService {
                                 .setPartNum(partDetails.getPartNum())
                                 .setRepairContent(partDetails.getRepairContent())
                                 .setPartType(partDetails.getPartType())
-                                .setPartId(partDetails.getPartId() == null ? 0L : partDetails.getPartId());
+                                .setPartId(Optional.ofNullable(partDetails.getPartId()).orElse(0L));
                         // 添加【维修记录表】
                         repairMapper.addRecord(repairApplyRecord);
                     } else {