优化
This commit is contained in:
@@ -318,6 +318,8 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
|
||||
ResultBean<String> rb = ResultBean.fireFail();
|
||||
String msgTitle = dto.getMsgTitle();
|
||||
String msgContent = dto.getMsgContent();
|
||||
String orgPath = dto.getOrgPath();
|
||||
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
|
||||
List<String> list = dto.getList();
|
||||
List<String> receiveIdList = dto.getReceiveIdList();
|
||||
List<String> orgPathList = dto.getOrgPathList();
|
||||
@@ -349,6 +351,8 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
|
||||
messageDto.setMsgTargetUri(dto.getModuleAction());
|
||||
messageDto.setModuleAction(dto.getModuleAction2());
|
||||
messageDto.setSenderName("系统");
|
||||
messageDto.setSenderDeptSid(sysOrganizationVo.getSid());
|
||||
messageDto.setSenderDeptName(sysOrganizationVo.getName());
|
||||
String msgSid = saveOrUpdateAppMessage(messageDto).getData();
|
||||
String msgTypeSid = messageDto.getMsgTypeSid();
|
||||
// 2、保存至消息列表
|
||||
@@ -470,6 +474,7 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
|
||||
public ResultBean<String> pushMessageForCC(MessageFlowableQueryForCC query) {
|
||||
ResultBean<String> rb = ResultBean.fireFail();
|
||||
MessageFlowVo ufVo = query.getUfVo();
|
||||
String orgPath = query.getOrgPath();
|
||||
String procId = ufVo.getProcInsId();
|
||||
String procDefId = ufVo.getProcDefId();
|
||||
Map<String, Object> appMap = query.getAppMap();
|
||||
@@ -516,6 +521,7 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
|
||||
messageFlowableDto.setMsgTitle(msgTitle);
|
||||
messageFlowableDto.setCreateName(applicationName);
|
||||
messageFlowableDto.setTaskId(ufVo.getTaskId());
|
||||
messageFlowableDto.setOrgPath(orgPath);
|
||||
ResultBean<String> stringResultBean = getMessageRead(messageFlowableDto);
|
||||
String msgSid = stringResultBean.getData();
|
||||
return rb.success().setMsg(msgSid);
|
||||
|
||||
@@ -285,7 +285,7 @@
|
||||
FROM message_list ml
|
||||
LEFT JOIN message m ON ml.msgSid = m.sid
|
||||
where receiverSid = #{userSid}
|
||||
and m.msgType = "抄送"
|
||||
and m.msgType LIKE concat('%','抄送','%')
|
||||
and ml.state = 0
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user