Commit 592577b1 authored by tangwei's avatar tangwei

消息接口修改

parent 5aec2521
...@@ -232,7 +232,6 @@ public class OrgPersonController extends BaseController { ...@@ -232,7 +232,6 @@ public class OrgPersonController extends BaseController {
wrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_PERSON); wrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_PERSON);
wrapper.likeRight(OrgUsr::getBizOrgCode, reginParams.getPersonIdentity().getBizOrgCode()); wrapper.likeRight(OrgUsr::getBizOrgCode, reginParams.getPersonIdentity().getBizOrgCode());
List<OrgUsr> orgUsr = orgUsrMapper.selectList(wrapper); List<OrgUsr> orgUsr = orgUsrMapper.selectList(wrapper);
return ResponseHelper.buildResponse(orgUsr); return ResponseHelper.buildResponse(orgUsr);
} }
......
...@@ -124,7 +124,7 @@ public class MsgController extends AbstractBaseController { ...@@ -124,7 +124,7 @@ public class MsgController extends AbstractBaseController {
msg.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode()); msg.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
msg.setBizOrgName(reginParams.getPersonIdentity().getCompanyName()); msg.setBizOrgName(reginParams.getPersonIdentity().getCompanyName());
List<Msg> msgList = iMsgService.publishNotice(getToken(),getProduct(),getAppKey(),msg); List<Msg> msgList = iMsgService.publishNotice(null,null,null,msg);
msgList.forEach(m->{ msgList.forEach(m->{
jobService.msgAddJob(m); jobService.msgAddJob(m);
}); });
......
...@@ -380,6 +380,9 @@ public class MessageServiceImpl implements IMessageService { ...@@ -380,6 +380,9 @@ public class MessageServiceImpl implements IMessageService {
msg.setTitle(MsgTypeEnum.NOTIFY.getName()); msg.setTitle(MsgTypeEnum.NOTIFY.getName());
msg.setUserId(user.get("amosOrgId")!=null?user.get("amosOrgId").toString():""); msg.setUserId(user.get("amosOrgId")!=null?user.get("amosOrgId").toString():"");
msg.setReciverName(user.get("bizOrgName").toString()); msg.setReciverName(user.get("bizOrgName").toString());
msg.setBizOrgCode(notice.getBizOrgCode());
msg.setBizOrgName(notice.getBizOrgName());
if (isImmediately) { //立即发送 if (isImmediately) { //立即发送
msg = pushMsgAndSave( toke, product, appKey,msg); msg = pushMsgAndSave( toke, product, appKey,msg);
} else { //定时发送 } else { //定时发送
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment