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

优化

Browse Source
This commit is contained in:
God
2023-06-20 17:52:59 +08:00
parent f4c68c651b
commit 1a4cbd9b29
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -318,6 +318,8 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
ResultBean<String> rb = ResultBean.fireFail(); ResultBean<String> rb = ResultBean.fireFail();
String msgTitle = dto.getMsgTitle(); String msgTitle = dto.getMsgTitle();
String msgContent = dto.getMsgContent(); String msgContent = dto.getMsgContent();
String orgPath = dto.getOrgPath();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
List<String> list = dto.getList(); List<String> list = dto.getList();
List<String> receiveIdList = dto.getReceiveIdList(); List<String> receiveIdList = dto.getReceiveIdList();
List<String> orgPathList = dto.getOrgPathList(); List<String> orgPathList = dto.getOrgPathList();
@@ -349,6 +351,8 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
messageDto.setMsgTargetUri(dto.getModuleAction()); messageDto.setMsgTargetUri(dto.getModuleAction());
messageDto.setModuleAction(dto.getModuleAction2()); messageDto.setModuleAction(dto.getModuleAction2());
messageDto.setSenderName("系统"); messageDto.setSenderName("系统");
messageDto.setSenderDeptSid(sysOrganizationVo.getSid());
messageDto.setSenderDeptName(sysOrganizationVo.getName());
String msgSid = saveOrUpdateAppMessage(messageDto).getData(); String msgSid = saveOrUpdateAppMessage(messageDto).getData();
String msgTypeSid = messageDto.getMsgTypeSid(); String msgTypeSid = messageDto.getMsgTypeSid();
// 2、保存至消息列表 // 2、保存至消息列表
@@ -470,6 +474,7 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
public ResultBean<String> pushMessageForCC(MessageFlowableQueryForCC query) { public ResultBean<String> pushMessageForCC(MessageFlowableQueryForCC query) {
ResultBean<String> rb = ResultBean.fireFail(); ResultBean<String> rb = ResultBean.fireFail();
MessageFlowVo ufVo = query.getUfVo(); MessageFlowVo ufVo = query.getUfVo();
String orgPath = query.getOrgPath();
String procId = ufVo.getProcInsId(); String procId = ufVo.getProcInsId();
String procDefId = ufVo.getProcDefId(); String procDefId = ufVo.getProcDefId();
Map<String, Object> appMap = query.getAppMap(); Map<String, Object> appMap = query.getAppMap();
@@ -516,6 +521,7 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
messageFlowableDto.setMsgTitle(msgTitle); messageFlowableDto.setMsgTitle(msgTitle);
messageFlowableDto.setCreateName(applicationName); messageFlowableDto.setCreateName(applicationName);
messageFlowableDto.setTaskId(ufVo.getTaskId()); messageFlowableDto.setTaskId(ufVo.getTaskId());
messageFlowableDto.setOrgPath(orgPath);
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);

2
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml
View File

@@ -285,7 +285,7 @@
FROM message_list ml FROM message_list ml
LEFT JOIN message m ON ml.msgSid = m.sid LEFT JOIN message m ON ml.msgSid = m.sid
where receiverSid = #{userSid} where receiverSid = #{userSid}
and m.msgType = "抄送" and m.msgType LIKE concat('%','抄送','%')
and ml.state = 0 and ml.state = 0
</select> </select>
</mapper> </mapper>