Merge branch 'qtz1' of SH-Arbitrate/Mediation-Backend into dev

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java

         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);
             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);
             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("签收成功");