diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableQueryForCC.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableQueryForCC.java index bf52479..0e6430b 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableQueryForCC.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableQueryForCC.java @@ -33,4 +33,7 @@ public class MessageFlowableQueryForCC implements Query { @ApiModelProperty("当前所登陆账号的sid") private String userSid; + private String moduleAction; + private String moduleAction2; + private String moduleSid; } diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java index ef105ad..6d35cb0 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java @@ -918,21 +918,27 @@ public class MessageService extends MybatisBaseService { //查询流程审批的页面操作地址组装json的参数 //根据taskDef和移动端标识 /**-----------------移动端相关参数开始----------------*/ - ResultBean selectUrlByKey = sysProUrlFeign.selectUrlByKey(procDefId, ufVo.getTaskDefKey(), "2", "2"); - SysProUrlVo sysProUrlVo = selectUrlByKey.getData(); - messageFlowableDto.setBusinessSid(query.getBusinessSid()); - messageFlowableDto.setApp_type("2"); - if (sysProUrlVo.getUrl().contains("#")) { - messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0)); - } else { - messageFlowableDto.setModuleAction(sysProUrlVo.getUrl()); + if(!"Event_end".equals(ufVo.getTaskDefKey())){ + ResultBean selectUrlByKey = sysProUrlFeign.selectUrlByKey(procDefId, ufVo.getTaskDefKey(), "2", "2"); + SysProUrlVo sysProUrlVo = selectUrlByKey.getData(); + messageFlowableDto.setBusinessSid(query.getBusinessSid()); + messageFlowableDto.setApp_type("2"); + if (sysProUrlVo.getUrl().contains("#")) { + messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0)); + } else { + messageFlowableDto.setModuleAction(sysProUrlVo.getUrl()); + } + /**-----------------移动端相关参数结束----------------*/ + //PC取前端页面 + ResultBean 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 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.setProcInsId(ufVo.getProcInsId()); messageJsonDto.setAppMap(appMap);