diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableDto.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableDto.java index 33f8d2a..0efe609 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableDto.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableDto.java @@ -52,6 +52,10 @@ public class MessageFlowableDto implements Dto { private String taskId; @ApiModelProperty("接收人的组织机构") private List orgPathList = new ArrayList<>(); + @ApiModelProperty("发送人的组织机构全路径") + private String orgPath; + + private String userSid; } diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableQueryForCC.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableQueryForCC.java index 3ed79e6..ef361ea 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableQueryForCC.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableQueryForCC.java @@ -36,4 +36,6 @@ public class MessageFlowableQueryForCC implements Query { /* private String moduleAction; private String moduleAction2; private String moduleSid;*/ + @ApiModelProperty("当前所登账号的所在组织机构全路径") + private String orgPath; } diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java index f279d09..d18e104 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java @@ -9,6 +9,8 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; import com.yxt.common.base.service.MybatisBaseService; @@ -67,6 +69,8 @@ public class MessageService extends MybatisBaseService { private FlowTaskFeign flowTaskFeign; @Autowired private SysProUrlFeign sysProUrlFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; public PagerVo listPage(PagerQuery pq) { MessageQuery query = pq.getParams(); @@ -947,6 +951,8 @@ public class MessageService extends MybatisBaseService { messageFlowableDto.setMsgTitle(msgTitle); messageFlowableDto.setCreateName(applicationName); messageFlowableDto.setTaskId(ufVo.getTaskId()); + messageFlowableDto.setOrgPath(query.getOrgPath()); + messageFlowableDto.setUserSid(query.getUserSid()); ResultBean stringResultBean = getMessageShare(messageFlowableDto); String msgSid = stringResultBean.getData(); return rb.success().setMsg(msgSid); @@ -977,6 +983,18 @@ public class MessageService extends MybatisBaseService { } } } + if(StringUtils.isNotBlank(dto.getOrgPath())){ + //根据orgPath查询部门 + List orgPathsList = Arrays.asList(dto.getOrgPath().split("/")); + String orgSids = orgPathsList.get(orgPathsList.size() - 1); + messageDto.setSenderDeptSid(orgSids); + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(orgSids); + if(organizationResultBean.getData() != null){ + String deptName = organizationResultBean.getData().getName(); + messageDto.setSenderDeptName(deptName); + } + } + messageDto.setSenderSid(dto.getUserSid()); messageDto.setMsgTitle(msgTitle); messageDto.setMsgContent(msgContent); messageDto.setMsgSource("分享");