ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 企标制修订发送消息失败导致的流程提交失败

Browse Source
This commit is contained in:
mzaxd
2024-04-24 15:55:31 +08:00
parent 1968523fd2
commit 7458288ffa
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java
+8 -5
View File
@@ -1,5 +1,6 @@
package com.jero.modules.docking.hiwork.service.impl; package com.jero.modules.docking.hiwork.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.dto.message.SendMessageDTO; import com.jero.common.api.dto.message.SendMessageDTO;
import com.jero.common.api.vo.SendMessageAPI; import com.jero.common.api.vo.SendMessageAPI;
@@ -82,11 +83,13 @@ public class SendMessageServiceImpl implements SendMessageAPI {
} }
List<String> typeList = Arrays.asList(sysMessageTemplate.getTemplateType().split(",")); List<String> typeList = Arrays.asList(sysMessageTemplate.getTemplateType().split(","));
if (openPage.contains("/workCenter/processCenter/processCenter")) { if (StrUtil.isNotBlank(openPage)) {
if (openPage.contains("?")) { if (openPage.contains("/workCenter/processCenter/processCenter")) {
openPage = openPage + "&activeTab=TodoList"; if (openPage.contains("?")) {
} else { openPage = openPage + "&activeTab=TodoList";
openPage = openPage + "?activeTab=TodoList"; } else {
openPage = openPage + "?activeTab=TodoList";
}
} }
} }
String finalOpenType = openType; String finalOpenType = openType;
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+3 -1
View File
@@ -870,7 +870,9 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
msg.append("理由为：").append(advice.getReason()).append("；"); msg.append("理由为：").append(advice.getReason()).append("；");
} }
// 去除最后一个分号 // 去除最后一个分号
msg.deleteCharAt(msg.length() - 1); if (StrUtil.isNotBlank(msg)) {
msg.deleteCharAt(msg.length() - 1);
}
sendMap.put("msg", msg.toString()); sendMap.put("msg", msg.toString());
sendMessageDTO.setMap(sendMap); sendMessageDTO.setMap(sendMap);
sendMessageAPI.sendMessage(sendMessageDTO); sendMessageAPI.sendMessage(sendMessageDTO);