分享+评论附件

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

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

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

@@ -918,27 +918,21 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
         //查询流程审批的页面操作地址组装json的参数
         //根据taskDef和移动端标识
         /**-----------------移动端相关参数开始----------------*/
-        if(!"Event_end".equals(ufVo.getTaskDefKey())){
-            ResultBean<SysProUrlVo> 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<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());
+        ResultBean<SysProUrlVo> 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<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.setProcInsId(ufVo.getProcInsId());
         messageJsonDto.setAppMap(appMap);