From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
index a91f7ee..449a739 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
@@ -76,8 +76,8 @@
@Override
public int delProcessDeal(Integer id) {
ProcessDeal processDeal = processDealMapper.selectById(id);
- processDealMapper.deleteById(id);
ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(processDeal.getTotaldealId());
+ processDealMapper.deleteById(id);
processTotaldeal.setTotalNum(processTotaldeal.getTotalNum()-processDeal.getNum());
return processTotaldealMapper.updateById(processTotaldeal);
}
--
Gitblit v1.9.3