From 7b80a4665c969cfca087382ebf2f3a024d85ab79 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 17 Feb 2025 17:17:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=B0=83=E6=95=B4IM?=
 =?UTF-8?q?=E7=BE=A4=E4=B8=AD=E6=9F=A5=E8=AF=A2=E5=8F=82=E4=B8=8E=E4=BA=BA?=
 =?UTF-8?q?=E7=9A=84=20tips=20=E6=93=8D=E4=BD=9C=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ChangeRecordRelationServiceImpl.java  | 10 +++++-----
 .../server/service/impl/ChangeRecordServiceImpl.java   |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
index a0cdd637..7f377c1c 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
@@ -281,7 +281,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
             // IM 群中非群主的人
             Optional<ChangeRecordRelation> any = imGroupParticipate.stream()
                     .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();
             PersonProfileDto profile = visaProfileGateway.getProfile(record.getCreateBy());
             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()));
             } else {
                 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()
                         .name(VisaButtonTypeEnum.REJECT.getDesc())
                         .type(VisaButtonTypeEnum.REJECT.name())
                         .build());
+                buttons.add(ImGroupButton.builder()
+                        .name(VisaButtonTypeEnum.AGREE.getDesc())
+                        .type(VisaButtonTypeEnum.AGREE.name())
+                        .build());
 
             }
         } else {
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 85d8b0de..d4fa3835 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
@@ -1414,6 +1414,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
             req.setVisaId(req.getVisaId());
             // 解散 IM 群聊
             msgCenterGateway.dismissImGroup(request);
+            log.info("dismiss im group success");
         }
         if (StringUtils.hasText(record.getApprovalId())) {
             BpmnProcessInstanceAbortDTO abort = new BpmnProcessInstanceAbortDTO();