other_project/message-center
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
dimengzhe
2023-03-04 14:04:07 +08:00
parent 5f131f4f69
commit ad45e11e17
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableQueryForCC.java
View File

@@ -33,4 +33,7 @@ public class MessageFlowableQueryForCC implements Query {
@ApiModelProperty("当前所登陆账号的sid") @ApiModelProperty("当前所登陆账号的sid")
private String userSid; private String userSid;
private String moduleAction;
private String moduleAction2;
private String moduleSid;
} }

34
message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
View File

@@ -918,21 +918,27 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
//查询流程审批的页面操作地址组装json的参数 //查询流程审批的页面操作地址组装json的参数
//根据taskDef和移动端标识 //根据taskDef和移动端标识
/**-----------------移动端相关参数开始----------------*/ /**-----------------移动端相关参数开始----------------*/
ResultBean<SysProUrlVo> selectUrlByKey = sysProUrlFeign.selectUrlByKey(procDefId, ufVo.getTaskDefKey(), "2", "2"); if(!"Event_end".equals(ufVo.getTaskDefKey())){
SysProUrlVo sysProUrlVo = selectUrlByKey.getData(); ResultBean<SysProUrlVo> selectUrlByKey = sysProUrlFeign.selectUrlByKey(procDefId, ufVo.getTaskDefKey(), "2", "2");
messageFlowableDto.setBusinessSid(query.getBusinessSid()); SysProUrlVo sysProUrlVo = selectUrlByKey.getData();
messageFlowableDto.setApp_type("2"); messageFlowableDto.setBusinessSid(query.getBusinessSid());
if (sysProUrlVo.getUrl().contains("#")) { messageFlowableDto.setApp_type("2");
messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0)); if (sysProUrlVo.getUrl().contains("#")) {
} else { messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0));
messageFlowableDto.setModuleAction(sysProUrlVo.getUrl()); } else {
messageFlowableDto.setModuleAction(sysProUrlVo.getUrl());
}
/**-----------------移动端相关参数结束----------------*/
//PC取前端页面
ResultBean<SysProUrlVo> selectUrlByPCKey = sysProUrlFeign.selectUrlByKey(procDefId, ufVo.getTaskDefKey(), "2", "1");
SysProUrlVo sysProUrlPCVo = selectUrlByPCKey.getData();
messageFlowableDto.setModuleAction2(sysProUrlPCVo.getUrl());
messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0));
}else{
messageFlowableDto.setModuleAction(query.getModuleAction());
messageFlowableDto.setModuleAction2(query.getModuleAction2());
messageFlowableDto.setModuleSid(query.getModuleSid());
} }
/**-----------------移动端相关参数结束----------------*/
//PC取前端页面
ResultBean<SysProUrlVo> selectUrlByPCKey = sysProUrlFeign.selectUrlByKey(procDefId, ufVo.getTaskDefKey(), "2", "1");
SysProUrlVo sysProUrlPCVo = selectUrlByPCKey.getData();
messageFlowableDto.setModuleAction2(sysProUrlPCVo.getUrl());
messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0));
messageJsonDto.setTaskName(ufVo.getNodeState()); messageJsonDto.setTaskName(ufVo.getNodeState());
messageJsonDto.setProcInsId(ufVo.getProcInsId()); messageJsonDto.setProcInsId(ufVo.getProcInsId());
messageJsonDto.setAppMap(appMap); messageJsonDto.setAppMap(appMap);