This commit is contained in:
God
2023-06-25 10:22:28 +08:00
parent 1a4cbd9b29
commit 063a8454a8

View File

@@ -9,8 +9,10 @@ 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.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
import com.yxt.common.base.service.MybatisBaseService;
@@ -71,6 +73,8 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
private SysProUrlFeign sysProUrlFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public PagerVo<Message> listPage(PagerQuery<MessageQuery> pq) {
MessageQuery query = pq.getParams();
@@ -319,7 +323,12 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
String msgTitle = dto.getMsgTitle();
String msgContent = dto.getMsgContent();
String orgPath = dto.getOrgPath();
//根据组织全路径查询部门信息
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
//根据组织全路径查询分公司sid
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//根据分公司sid获取分公司信息
SysOrganization sysOrganizationFGS = sysOrganizationFeign.selectBySid(useOrgSid).getData();
List<String> list = dto.getList();
List<String> receiveIdList = dto.getReceiveIdList();
List<String> orgPathList = dto.getOrgPathList();
@@ -352,7 +361,7 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
messageDto.setModuleAction(dto.getModuleAction2());
messageDto.setSenderName("系统");
messageDto.setSenderDeptSid(sysOrganizationVo.getSid());
messageDto.setSenderDeptName(sysOrganizationVo.getName());
messageDto.setSenderDeptName(sysOrganizationFGS.getName() + "-" + sysOrganizationVo.getName());
String msgSid = saveOrUpdateAppMessage(messageDto).getData();
String msgTypeSid = messageDto.getMsgTypeSid();
// 2、保存至消息列表