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 d5bb448..8f4d0ad 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
@@ -320,18 +320,17 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
     @Override
     public Boolean updateRemark(Long masterId, String remark,Long requirementId,String masterNum) {
         if (masterId == null) return false;
-        if (requirementId == 0) {
-            SysOaWarehouseMaster update = new SysOaWarehouseMaster();
-            update.setMasterId(masterId);
-            update.setRequirementId(requirementId);
-            return baseMapper.updateById(update) > 0;
-        }
         SysOaWarehouseMaster update = new SysOaWarehouseMaster();
         update.setMasterId(masterId);
-        update.setRemark(remark);
-        update.setRequirementId(requirementId);
-        update.setMasterNum(masterNum);
-        return baseMapper.updateById(update) > 0;
+        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;
+        }
     }
     // 2. 修改returnType
     @Override