From 6b73cdfa22bd5dfb099aa6e16ae0ea94951ef460 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 20 Oct 2025 09:48:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(warehouse):=E4=BC=98=E5=8C=96=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E4=B8=BB=E8=A1=A8=E5=A4=87=E6=B3=A8=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用lambda表达式重构更新条件判断
- 当requirementId为0时，将requirementId设置为null
- 否则同时更新remark、requirementId和masterNum字段
-保持方法签名不变，提升代码可读性与维护性
---
 .../impl/SysOaWarehouseMasterServiceImpl.java | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
index 8f4d0ad..7894892 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
@@ -318,20 +318,26 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
     }
 
     @Override
-    public Boolean updateRemark(Long masterId, String remark,Long requirementId,String masterNum) {
+    public Boolean updateRemark(Long masterId, String remark, Long requirementId, String masterNum) {
         if (masterId == null) return false;
-        SysOaWarehouseMaster update = new SysOaWarehouseMaster();
-        update.setMasterId(masterId);
+
         if (requirementId == 0) {
-            update.setRequirementId(null);
-            return baseMapper.updateById(update) > 0;
-        }else {
-            update.setRemark(remark);
-            update.setRequirementId(requirementId);
-            update.setMasterNum(masterNum);
-            return baseMapper.updateById(update) > 0;
+            return baseMapper.update(null,
+                    Wrappers.<SysOaWarehouseMaster>lambdaUpdate()
+                            .set(SysOaWarehouseMaster::getRequirementId, null)
+                            .eq(SysOaWarehouseMaster::getMasterId, masterId)
+            ) > 0;
+        } else {
+            return baseMapper.update(null,
+                    Wrappers.<SysOaWarehouseMaster>lambdaUpdate()
+                            .set(SysOaWarehouseMaster::getRemark, remark)
+                            .set(SysOaWarehouseMaster::getRequirementId, requirementId)
+                            .set(SysOaWarehouseMaster::getMasterNum, masterNum)
+                            .eq(SysOaWarehouseMaster::getMasterId, masterId)
+            ) > 0;
         }
     }
+
     // 2. 修改returnType
     @Override
     public int updateReturnType(Long masterId, Integer returnType) {