diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java index 391c22d..b465408 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java @@ -2419,6 +2419,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { @Transactional(rollbackFor = Exception.class) @Override public AjaxResult mediation(MsCaseApplicationReq req) throws EsignDemoException, InterruptedException { + req.setSealFlag(null); // 查询案件是否存在 MsCaseApplication application = msCaseApplicationMapper.selectByPrimaryKey(req.getId()); if (application == null) { @@ -2709,7 +2710,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { if (caseFlow != null) { application.setCaseFlowId(caseFlow.getId()); application.setCaseStatusName(caseFlow.getCaseStatusName()); - msCaseApplicationMapper.updateByPrimaryKey(application); + msCaseApplicationMapper.updateByPrimaryKeySelective(application); // 新增日志 CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), ""); } @@ -2748,7 +2749,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { application.setCaseFlowId(caseFlow.getId()); application.setCaseStatusName(caseFlow.getCaseStatusName()); application.setMediaResult(mediaResult); - msCaseApplicationMapper.updateByPrimaryKey(application); + msCaseApplicationMapper.updateByPrimaryKeySelective(application); } return AjaxResult.success(); } else if (mediaResult == 3) { @@ -2760,7 +2761,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { application.setCaseFlowId(caseFlow.getId()); application.setCaseStatusName(caseFlow.getCaseStatusName()); application.setMediaResult(mediaResult); - msCaseApplicationMapper.updateByPrimaryKey(application); + msCaseApplicationMapper.updateByPrimaryKeySelective(application); // 新增日志 CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), ""); // 新增结束日志 @@ -2802,7 +2803,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { application.setCaseFlowId(caseFlow.getId()); application.setCaseStatusName(caseFlow.getCaseStatusName()); application.setMediaResult(mediaResult); - msCaseApplicationMapper.updateByPrimaryKey(application); + msCaseApplicationMapper.updateByPrimaryKeySelective(application); } return AjaxResult.success(); @@ -3051,7 +3052,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { application.setCaseFlowId(caseFlow.getId()); application.setCaseStatusName(caseFlow.getCaseStatusName()); application.setMediaResult(mediaResult); - msCaseApplicationMapper.updateByPrimaryKey(application); + msCaseApplicationMapper.updateByPrimaryKeySelective(application); // 新增日志 CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), ""); if (mediaResult == 2 || mediaResult == 3 || mediaResult == 4) { 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 68e55aa..261a5ae 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 @@ -522,7 +522,7 @@ public class MsSignSealServiceImpl implements MsSignSealService { return AjaxResult.error("未找到案件被申请操作人"); } MsCaseApplication caseApplication = msCaseApplicationMapper.selectByPrimaryKey(caseId); - Integer organizeFlag = caseApplication.getOrganizeFlag(); + Long userId = SecurityUtils.getUserId(); if(appOpt.get().getUserId()!=null && appOpt.get().getUserId().equals(userId)){ @@ -533,7 +533,6 @@ public class MsSignSealServiceImpl implements MsSignSealService { List sealSignRecords = sealSignRecordMapper.selectSealSignRecord(mssealSignRecord); if (sealSignRecords != null && sealSignRecords.size() > 0) { String signFlowid = sealSignRecords.get(0).getSignFlowId(); - if(organizeFlag!=null){ SealSignRecord sealSignRecord = new SealSignRecord(); sealSignRecord.setPensonAccount(appOpt.get().getPhone()); sealSignRecord.setPensonName(appOpt.get().getName()); @@ -549,7 +548,6 @@ public class MsSignSealServiceImpl implements MsSignSealService { String urlapply = signUrlData.get("shortUrl").getAsString(); sealSignRecordres.setSealUrl(urlapply); } - } return AjaxResult.success(sealSignRecordres); }else { return AjaxResult.error(); @@ -674,7 +672,7 @@ public class MsSignSealServiceImpl implements MsSignSealService { signStatusMediator!=null&&signStatusMediator.equals(1)){ // 根据流程id查找下一个流程节点 MsCaseFlow nextFlow=null; - if(caseApplicationselect.getSealFlag()!=null&&caseApplicationselect.getSealFlag()==1) { + if(caseApplicationselect.getSealFlag()!=null&&caseApplicationselect.getSealFlag().equals(1)) { // 需要用印 nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId()); }else { diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/shortmessage/impl/ShortMessageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/shortmessage/impl/ShortMessageServiceImpl.java index b1414b8..d95eb72 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/shortmessage/impl/ShortMessageServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/shortmessage/impl/ShortMessageServiceImpl.java @@ -121,11 +121,18 @@ public class ShortMessageServiceImpl implements ShortMessageService { List recordParamList = recordParamContentMap.get(record.getId()); if(recordParamContentMap.containsKey(record.getId()) && templateParamMap.containsKey(record.getMsSmsTemplateId())){ List templateParamList = templateParamMap.get(record.getMsSmsTemplateId()); + ArrayList copyParamList = new ArrayList<>(); for (int i = 0; i < templateParamList.size(); i++) { MsSmsTemplateParam templateParam = templateParamList.get(i); - templateParam.setParamValue(recordParamContentMap.get(record.getId()).get(i)); + MsSmsTemplateParam msSmsTemplateParam =new MsSmsTemplateParam(); + msSmsTemplateParam.setParam(templateParam.getParam()); + msSmsTemplateParam.setSmsTemplateId(templateParam.getSmsTemplateId()); + msSmsTemplateParam.setParamName(templateParam.getParamName()); + msSmsTemplateParam.setId(templateParam.getId()); + msSmsTemplateParam.setParamValue(recordParamContentMap.get(record.getId()).get(i)); + copyParamList.add(msSmsTemplateParam); } - record.setTemplateParams(templateParamList); + record.setTemplateParams(copyParamList); } // 按顺序替换占位符