diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java index 5df5d1d7..5aaf3f4e 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java @@ -91,7 +91,11 @@ public class ImGroupAddMembersEventHandler implements EventHandler, Initializing "initiatorName", ownerProfile.getRealName(), "visaType", StringUtils.isNotBlank(visaType) ? VisaTypeEnum.valueOf(visaType).getDesc() : "", "topic", group.getName()))); - notice.setRouterParams(new JSONObject(Maps.of("visaId", visaId))); + notice.setRouterParams(new JSONObject(Maps.of( + "visaId", visaId, + "ouId", member.getPersonOuId(), + "workspaceId", workspaceId + ))); noticeApi.send(notice); } log.info("receive add member event, push notice success!"); diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 727eebe7..a7f6cf4d 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -745,8 +745,14 @@ public class ChangeRecordServiceImpl extends ServiceImpl visaUploadFiles = this.buildAttachUploadFile(req.getId()); @@ -1460,7 +1466,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl { log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId()); - throw new ServiceException(String.format("%s已被其他%s关联,请重新选择", m.getBillType().getDesc(), visaType.getDesc())); + throw new ServiceException(String.format("%s已被其他%s单关联,请重新选择", m.getBillType().getDesc(), visaType.getDesc())); })); } @@ -1478,7 +1484,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl { log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId()); - throw new ServiceException(String.format("%s已被其他%s关联,请重新选择", m.getBillType().getDesc(), visaType.getDesc())); + throw new ServiceException(String.format("%s已被其他%s单关联,请重新选择", m.getBillType().getDesc(), visaType.getDesc())); })); }