fix：【CRM 客户管理】修改数据时，避免操作日志出现“删除负责人”的情况

YunaiV
1 parent a9c7b584
Showing 7 changed files with 24 additions and 17 deletions
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
@@ -142,6 +142,7 @@ public class CrmBusinessServiceImpl implements CrmBusinessService {
         updateBusinessProduct(updateObj.getId(), businessProducts);
         // 3. 记录操作日志上下文
+        updateReqVO.setOwnerUserId(oldBusiness.getOwnerUserId()); // 避免操作日志出现“删除负责人”的情况
         LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(oldBusiness, CrmBusinessSaveReqVO.class));
         LogRecordContext.putVariable("businessName", oldBusiness.getName());
     }
@@ -92,19 +92,20 @@ public class CrmClueServiceImpl implements CrmClueService {
     @Transactional(rollbackFor = Exception.class)
     @LogRecord(type = CRM_CLUE_TYPE, subType = CRM_CLUE_UPDATE_SUB_TYPE, bizNo = "{{#updateReqVO.id}}",
             success = CRM_CLUE_UPDATE_SUCCESS)
-    @CrmPermission(bizType = CrmBizTypeEnum.CRM_CLUE, bizId = "#updateReq.id", level = CrmPermissionLevelEnum.OWNER)
-    public void updateClue(CrmClueSaveReqVO updateReq) {
-        Assert.notNull(updateReq.getId(), "线索编号不能为空");
+    @CrmPermission(bizType = CrmBizTypeEnum.CRM_CLUE, bizId = "#updateReqVO.id", level = CrmPermissionLevelEnum.OWNER)
+    public void updateClue(CrmClueSaveReqVO updateReqVO) {
+        Assert.notNull(updateReqVO.getId(), "线索编号不能为空");
         // 1.1 校验线索是否存在
-        CrmClueDO oldClue = validateClueExists(updateReq.getId());
+        CrmClueDO oldClue = validateClueExists(updateReqVO.getId());
         // 1.2 校验关联数据
-        validateRelationDataExists(updateReq);
+        validateRelationDataExists(updateReqVO);
         // 2. 更新线索
-        CrmClueDO updateObj = BeanUtils.toBean(updateReq, CrmClueDO.class);
+        CrmClueDO updateObj = BeanUtils.toBean(updateReqVO, CrmClueDO.class);
         clueMapper.updateById(updateObj);
         // 3. 记录操作日志上下文
+        updateReqVO.setOwnerUserId(oldClue.getOwnerUserId()); // 避免操作日志出现“删除负责人”的情况
         LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(oldClue, CrmCustomerSaveReqVO.class));
         LogRecordContext.putVariable("clueName", oldClue.getName());
     }
@@ -114,6 +114,7 @@ public class CrmContactServiceImpl implements CrmContactService {
         contactMapper.updateById(updateObj);
         // 3. 记录操作日志
+        updateReqVO.setOwnerUserId(oldContact.getOwnerUserId()); // 避免操作日志出现“删除负责人”的情况
         LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(oldContact, CrmContactSaveReqVO.class));
         LogRecordContext.putVariable("contactName", oldContact.getName());
     }
@@ -140,9 +140,9 @@ public class CrmContractServiceImpl implements CrmContractService {
         Assert.notNull(updateReqVO.getId(), "合同编号不能为空");
         updateReqVO.setOwnerUserId(null); // 不允许更新的字段
         // 1.1 校验存在
-        CrmContractDO contract = validateContractExists(updateReqVO.getId());
+        CrmContractDO oldContract = validateContractExists(updateReqVO.getId());
         // 1.2 只有草稿、审批中，可以编辑；
-        if (!ObjectUtils.equalsAny(contract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
+        if (!ObjectUtils.equalsAny(oldContract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
                 CrmAuditStatusEnum.PROCESS.getStatus())) {
             throw exception(CONTRACT_UPDATE_FAIL_NOT_DRAFT);
         }
@@ -159,8 +159,9 @@ public class CrmContractServiceImpl implements CrmContractService {
         updateContractProduct(updateReqVO.getId(), contractProducts);
         // 3. 记录操作日志上下文
-        LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(contract, CrmContractSaveReqVO.class));
-        LogRecordContext.putVariable("contractName", contract.getName());
+        updateReqVO.setOwnerUserId(oldContract.getOwnerUserId()); // 避免操作日志出现“删除负责人”的情况
+        LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(oldContract, CrmContractSaveReqVO.class));
+        LogRecordContext.putVariable("contractName", oldContract.getName());
     }
     private void updateContractProduct(Long id, List<CrmContractProductDO> newList) {
@@ -137,6 +137,7 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
         customerMapper.updateById(updateObj);
         // 3. 记录操作日志上下文
+        updateReqVO.setOwnerUserId(oldCustomer.getOwnerUserId()); // 避免操作日志出现“删除负责人”的情况
         LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(oldCustomer, CrmCustomerSaveReqVO.class));
         LogRecordContext.putVariable("customerName", oldCustomer.getName());
     }
@@ -104,6 +104,7 @@ public class CrmReceivablePlanServiceImpl implements CrmReceivablePlanService {
         receivablePlanMapper.updateById(updateObj);
         // 3. 记录操作日志上下文
+        updateReqVO.setOwnerUserId(oldReceivablePlan.getOwnerUserId()); // 避免操作日志出现“删除负责人”的情况
         LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(oldReceivablePlan, CrmReceivablePlanSaveReqVO.class));
         LogRecordContext.putVariable("receivablePlan", oldReceivablePlan);
     }
@@ -162,14 +162,14 @@ public class CrmReceivableServiceImpl implements CrmReceivableService {
         Assert.notNull(updateReqVO.getId(), "回款编号不能为空");
         updateReqVO.setOwnerUserId(null).setCustomerId(null).setContractId(null).setPlanId(null); // 不允许修改的字段
         // 1.1 校验存在
-        CrmReceivableDO receivable = validateReceivableExists(updateReqVO.getId());
-        updateReqVO.setOwnerUserId(receivable.getOwnerUserId()).setCustomerId(receivable.getCustomerId())
-                .setContractId(receivable.getContractId()).setPlanId(receivable.getPlanId()); // 设置已存在的值
+        CrmReceivableDO oldReceivable = validateReceivableExists(updateReqVO.getId());
+        updateReqVO.setOwnerUserId(oldReceivable.getOwnerUserId()).setCustomerId(oldReceivable.getCustomerId())
+                .setContractId(oldReceivable.getContractId()).setPlanId(oldReceivable.getPlanId()); // 设置已存在的值
         // 1.2 校验可回款金额超过上限
         validateReceivablePriceExceedsLimit(updateReqVO);
         // 1.3 只有草稿、审批中，可以编辑；
-        if (!ObjectUtils.equalsAny(receivable.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
+        if (!ObjectUtils.equalsAny(oldReceivable.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
                 CrmAuditStatusEnum.PROCESS.getStatus())) {
             throw exception(RECEIVABLE_UPDATE_FAIL_EDITING_PROHIBITED);
         }
@@ -179,9 +179,10 @@ public class CrmReceivableServiceImpl implements CrmReceivableService {
         receivableMapper.updateById(updateObj);
         // 3. 记录操作日志上下文
-        LogRecordContext.putVariable("receivable", receivable);
-        LogRecordContext.putVariable("period", getReceivablePeriod(receivable.getPlanId()));
-        LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(receivable, CrmReceivableSaveReqVO.class));
+        updateReqVO.setOwnerUserId(oldReceivable.getOwnerUserId()); // 避免操作日志出现“删除负责人”的情况
+        LogRecordContext.putVariable("oldReceivable", oldReceivable);
+        LogRecordContext.putVariable("period", getReceivablePeriod(oldReceivable.getPlanId()));
+        LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(oldReceivable, CrmReceivableSaveReqVO.class));
     }
     private Integer getReceivablePeriod(Long planId) {