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

分享添加发起部门

Browse Source
This commit is contained in:
dimengzhe
2023-03-13 09:43:39 +08:00
parent 0e90679f7d
commit b55cbb0e55
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableDto.java
View File

@@ -52,6 +52,10 @@ public class MessageFlowableDto implements Dto {
private String taskId; private String taskId;
@ApiModelProperty("接收人的组织机构") @ApiModelProperty("接收人的组织机构")
private List<String> orgPathList = new ArrayList<>(); private List<String> orgPathList = new ArrayList<>();
@ApiModelProperty("发送人的组织机构全路径")
private String orgPath;
private String userSid;
} }

2
message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFlowableQueryForCC.java
View File

@@ -36,4 +36,6 @@ public class MessageFlowableQueryForCC implements Query {
/* private String moduleAction; /* private String moduleAction;
private String moduleAction2; private String moduleAction2;
private String moduleSid;*/ private String moduleSid;*/
@ApiModelProperty("当前所登账号的所在组织机构全路径")
private String orgPath;
} }

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

@@ -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.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; 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.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
@@ -67,6 +69,8 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
private FlowTaskFeign flowTaskFeign; private FlowTaskFeign flowTaskFeign;
@Autowired @Autowired
private SysProUrlFeign sysProUrlFeign; private SysProUrlFeign sysProUrlFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
public PagerVo<Message> listPage(PagerQuery<MessageQuery> pq) { public PagerVo<Message> listPage(PagerQuery<MessageQuery> pq) {
MessageQuery query = pq.getParams(); MessageQuery query = pq.getParams();
@@ -947,6 +951,8 @@ 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(query.getOrgPath());
messageFlowableDto.setUserSid(query.getUserSid());
ResultBean<String> stringResultBean = getMessageShare(messageFlowableDto); ResultBean<String> stringResultBean = getMessageShare(messageFlowableDto);
String msgSid = stringResultBean.getData(); String msgSid = stringResultBean.getData();
return rb.success().setMsg(msgSid); return rb.success().setMsg(msgSid);
@@ -977,6 +983,18 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
} }
} }
} }
if(StringUtils.isNotBlank(dto.getOrgPath())){
//根据orgPath查询部门
List<String> orgPathsList = Arrays.asList(dto.getOrgPath().split("/"));
String orgSids = orgPathsList.get(orgPathsList.size() - 1);
messageDto.setSenderDeptSid(orgSids);
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(orgSids);
if(organizationResultBean.getData() != null){
String deptName = organizationResultBean.getData().getName();
messageDto.setSenderDeptName(deptName);
}
}
messageDto.setSenderSid(dto.getUserSid());
messageDto.setMsgTitle(msgTitle); messageDto.setMsgTitle(msgTitle);
messageDto.setMsgContent(msgContent); messageDto.setMsgContent(msgContent);
messageDto.setMsgSource("分享"); messageDto.setMsgSource("分享");