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-06 17:31:32 +08:00
parent ad45e11e17
commit b41df59944
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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