diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java index d7f9e9d..b76d13f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java @@ -723,6 +723,11 @@ public class MsSignSealServiceImpl implements MsSignSealService { Long caseId = dto.getCaseId(); MsCaseAffiliate caseAffiliate = msCaseAffiliateMapper.selectByPrimaryKey(caseId); MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(caseId); + // 查询当前节点 + MsCaseFlow currentFlow = caseFlowMapper.selectByPrimaryKey(caseApplicationselect.getCaseFlowId()); + if (currentFlow == null) { + return AjaxResult.error("当前流程不存在"); + } // if (dto.getIsSignApply() != null && dto.getIsSignApply().intValue() == 1) { // caseAffiliate.setIsSignApply(1); // msCaseAffiliateMapper.updateByPrimaryKeySelective(caseAffiliate); @@ -744,7 +749,7 @@ public class MsSignSealServiceImpl implements MsSignSealService { caseApplicationselect.setCaseFlowId(nextFlow.getId()); caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName()); caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect); - CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"签收"); + CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"签收"); } // if (dto.getIsSignRespon() != null && dto.getIsSignRespon().intValue() == 1) { // caseAffiliate.setIsSignRespon(1); @@ -768,7 +773,7 @@ public class MsSignSealServiceImpl implements MsSignSealService { caseApplicationselect.setCaseFlowId(nextFlow.getId()); caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName()); caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect); - CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"签收"); + CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"签收"); } return AjaxResult.success("签收成功");