From b7358e4081a71093a9af42bc381227ffce67cbe7 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 7 Feb 2025 18:02:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=B0=83=E6=95=B4=20Super?=
 =?UTF-8?q?Builder=20=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visa/api/request/ImGroupOperationReq.java     |  2 ++
 .../im/ImGroupRemoveMembersEventHandler.java      | 15 ++++++++-------
 .../service/impl/ChangeRecordServiceImpl.java     |  2 ++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ImGroupOperationReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ImGroupOperationReq.java
index 9b4141d9..8f39d8be 100644
--- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ImGroupOperationReq.java
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ImGroupOperationReq.java
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import javax.validation.constraints.NotNull;
 
@@ -18,6 +19,7 @@ import javax.validation.constraints.NotNull;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@SuperBuilder
 public class ImGroupOperationReq {
     /**
      * 变洽签 ID
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupRemoveMembersEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupRemoveMembersEventHandler.java
index 16e77ba2..c2ab3bf6 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupRemoveMembersEventHandler.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupRemoveMembersEventHandler.java
@@ -57,13 +57,14 @@ public class ImGroupRemoveMembersEventHandler implements EventHandler, Initializ
     private void removeMemberVote(GroupInfo group, GroupMemberInfo member) {
         Long visaId = (Long) group.getBizGroupInfo().getOrDefault(IM_GROUP_BIZ_INFO_VISA_ID, "");
 
-        ImGroupOperationClearReq build = new ImGroupOperationClearReq();
-        build.setClearAll(false);
-        build.setImGroupId(group.getTid());
-        build.setVisaId(visaId);
-        build.setOperatorPersonId(member.getPersonId());
-        build.setOperatorOuId(member.getPersonOuId());
-        changeRecordRelationService.clearImOperationParticipate(build);
+
+        changeRecordRelationService.clearImOperationParticipate(ImGroupOperationClearReq.builder()
+                .clearAll(false)
+                .imGroupId(group.getTid())
+                .visaId(visaId)
+                .operatorPersonId(member.getPersonId())
+                .operatorOuId(member.getPersonOuId())
+                .build());
     }
 
     @Override
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 21a3b40a..a92cb018 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
@@ -1179,6 +1179,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
 
     @Override
     public Long approveCreateOnlyVisaChangeRecord(VisaChangeApproveOnlyReq req) {
+        ChangeRecord visa = getById(req.getVisaId());
+        req.setOperatorWorkspaceId(visa.getRelationWorkspaceId());
         validOperationPermission(req.getVisaId(), req.getOperatorPersonId(), req.getOperatorOuId(), req.getOperatorWorkspaceId());
 
         VisaChangeApproveCreateReq createReq = buildVisaChangeApproveCreateReqByVisaId(req.getVisaId());