|
|
@ -167,7 +167,11 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> { |
|
|
|
if (StringUtils.isBlank(dto.getSid())) { // 新增
|
|
|
|
Message message = new Message(); |
|
|
|
dto.fillEntity(message); |
|
|
|
message.setSid(UUID.randomUUID().toString()); |
|
|
|
if (StringUtils.isNotBlank(dto.getTaskId())) { |
|
|
|
message.setSid(dto.getTaskId()); |
|
|
|
}else{ |
|
|
|
message.setSid(UUID.randomUUID().toString()); |
|
|
|
} |
|
|
|
Boolean flag = save(message); |
|
|
|
if (flag) { |
|
|
|
return new ResultBean().success().setMsg("保存成功").setData(message.getSid()); |
|
|
@ -204,6 +208,9 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getTaskId())) { |
|
|
|
messageDto.setTaskId(dto.getTaskId()); |
|
|
|
} |
|
|
|
messageDto.setMsgTitle(msgTitle); |
|
|
|
messageDto.setMsgContent(msgContent); |
|
|
|
messageDto.setMsgSource("审批中心"); |
|
|
|