This commit is contained in:
dimengzhe
2023-09-25 15:12:31 +08:00
parent 0de5c6281e
commit dea1170baa

View File

@@ -366,7 +366,8 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
messageDto.setArgs_json(JSONObject.toJSONString(jsonMap)); messageDto.setArgs_json(JSONObject.toJSONString(jsonMap));
messageDto.setMsgTargetUri(dto.getModuleAction()); messageDto.setMsgTargetUri(dto.getModuleAction());
messageDto.setModuleAction(dto.getModuleAction2()); messageDto.setModuleAction(dto.getModuleAction2());
messageDto.setSenderName("系统"); messageDto.setSenderName(dto.getCreateName());
messageDto.setSenderSid(dto.getUserSid());
messageDto.setSenderDeptSid(sysOrganizationVo.getSid()); messageDto.setSenderDeptSid(sysOrganizationVo.getSid());
messageDto.setSenderDeptName(sysOrganizationFGS.getName() + "-" + sysOrganizationVo.getName()); messageDto.setSenderDeptName(sysOrganizationFGS.getName() + "-" + sysOrganizationVo.getName());
String msgSid = saveOrUpdateAppMessage(messageDto).getData(); String msgSid = saveOrUpdateAppMessage(messageDto).getData();
@@ -539,6 +540,7 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
messageFlowableDto.setCreateName(applicationName); messageFlowableDto.setCreateName(applicationName);
messageFlowableDto.setTaskId(ufVo.getTaskId()); messageFlowableDto.setTaskId(ufVo.getTaskId());
messageFlowableDto.setOrgPath(orgPath); messageFlowableDto.setOrgPath(orgPath);
messageFlowableDto.setUserSid(query.getUserSid());
ResultBean<String> stringResultBean = getMessageRead(messageFlowableDto); ResultBean<String> stringResultBean = getMessageRead(messageFlowableDto);
String msgSid = stringResultBean.getData(); String msgSid = stringResultBean.getData();
return rb.success().setMsg(msgSid); return rb.success().setMsg(msgSid);