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 5e70d8aa..a9e38e7a 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 @@ -87,6 +87,7 @@ public class ImGroupAddMembersEventHandler implements EventHandler, Initializing notice.setBizEventMappingCode(refreshableConfiguration.getImGroupAddMemberNoticeEventCode()); notice.setBizCode(String.valueOf(visaId)); notice.setBizExtParams(new JSONObject(Maps.of( + "visaId", visaId, "initiatorName", ownerProfile.getRealName(), "visaType", StringUtils.isNotBlank(visaType) ? VisaTypeEnum.valueOf(visaType).getDesc() : "", "topic", group.getName()))); 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 b1f7a410..22cde5f5 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 @@ -638,6 +638,13 @@ public class ChangeRecordServiceImpl extends ServiceImpl buildVisaBillDto(VisaChangeTempCreateReq req, ChangeRecord changeRecord) { return req.getRelationOrderMap().entrySet().stream() + .peek(os -> { + if (VisaBillTypeEnum.TASK.name().equals(os.getKey())) { + os.setValue(os.getValue().stream().filter(o -> StringUtils.hasText(o.getNo())).collect(Collectors.toList())); + } else { + os.setValue(os.getValue().stream().filter(o -> NumberUtil.isPositiveNumber(o.getId())).collect(Collectors.toList())); + } + }) .flatMap(os -> os.getValue().stream() .map(o -> VisaBillDto.builder() .visaId(changeRecord.getId())