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.lambdaUpdate() + .set(SysOaWarehouseMaster::getRequirementId, null) + .eq(SysOaWarehouseMaster::getMasterId, masterId) + ) > 0; + } else { + return baseMapper.update(null, + Wrappers.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) {