wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3300) - 调整IM群中查询参与人的 tips 操作条

Browse Source
This commit is contained in:
wangli 2025-02-17 17:17:47 +08:00
parent 29cea016ba
commit 7b80a4665c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
View File

@ -281,7 +281,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
// IM 群中非群主的人 // IM 群中非群主的人
Optional<ChangeRecordRelation> any = imGroupParticipate.stream() Optional<ChangeRecordRelation> any = imGroupParticipate.stream()
.filter(i -> Objects.equals(i.getCreateBy(), req.getPersonId())) .filter(i -> Objects.equals(i.getCreateBy(), req.getPersonId()))
.filter(i -> Objects.equals(i.getContentExt(), String.valueOf(req.getOuId()))) .filter(i -> Objects.equals(i.getContent(), String.valueOf(req.getOuId())))
.findAny(); .findAny();
PersonProfileDto profile = visaProfileGateway.getProfile(record.getCreateBy()); PersonProfileDto profile = visaProfileGateway.getProfile(record.getCreateBy());
if (any.isPresent()) { if (any.isPresent()) {
@ -290,14 +290,14 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
resp.setTipsText(String.format(IM_GROUP_PARTICIPATE_TIPS_OPERATED, buttonType.getDesc(), profile.getRealName(), record.getTopic())); resp.setTipsText(String.format(IM_GROUP_PARTICIPATE_TIPS_OPERATED, buttonType.getDesc(), profile.getRealName(), record.getTopic()));
} else { } else {
resp.setTipsText(String.format(IM_GROUP_PARTICIPATE_TIPS, profile.getRealName(), record.getTopic())); resp.setTipsText(String.format(IM_GROUP_PARTICIPATE_TIPS, profile.getRealName(), record.getTopic()));
buttons.add(ImGroupButton.builder()
.name(VisaButtonTypeEnum.AGREE.getDesc())
.type(VisaButtonTypeEnum.AGREE.name())
.build());
buttons.add(ImGroupButton.builder() buttons.add(ImGroupButton.builder()
.name(VisaButtonTypeEnum.REJECT.getDesc()) .name(VisaButtonTypeEnum.REJECT.getDesc())
.type(VisaButtonTypeEnum.REJECT.name()) .type(VisaButtonTypeEnum.REJECT.name())
.build()); .build());
buttons.add(ImGroupButton.builder()
.name(VisaButtonTypeEnum.AGREE.getDesc())
.type(VisaButtonTypeEnum.AGREE.name())
.build());
} }
} else { } else {

1
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
View File

@ -1414,6 +1414,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
req.setVisaId(req.getVisaId()); req.setVisaId(req.getVisaId());
// 解散 IM 群聊 // 解散 IM 群聊
msgCenterGateway.dismissImGroup(request); msgCenterGateway.dismissImGroup(request);
log.info("dismiss im group success");
} }
if (StringUtils.hasText(record.getApprovalId())) { if (StringUtils.hasText(record.getApprovalId())) {
BpmnProcessInstanceAbortDTO abort = new BpmnProcessInstanceAbortDTO(); BpmnProcessInstanceAbortDTO abort = new BpmnProcessInstanceAbortDTO();