From 8fb3e221e5d19b01c967bbebc2862aa67c6cb57b Mon Sep 17 00:00:00 2001
From: xudawei <xudawei@axzo.cn>
Date: Mon, 10 Feb 2025 16:24:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20(REQ-3300)=20=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85-=E5=8A=A0=E4=B8=8A=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98topic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visa/server/rpc/DataObjectApiGateway.java    | 16 ++++++++--------
 .../service/impl/ChangeRecordServiceImpl.java    |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java
index 6b183872..73d4681f 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java
@@ -44,18 +44,18 @@ public class DataObjectApiGateway {
     private MatchDataObjectResp mockDataObject() {
         MergeMatchDataResp.DataItem dt1 = MergeMatchDataResp.DataItem.builder()
                 .personIds(Lists.newArrayList(9000398292L,89511L))
-                .ouId(6122L)
-                .workspaceId(399L)
-                .nodeId(10345L)
-                .projectIds(Lists.newArrayList(424L))
+//                .ouId(6122L)
+//                .workspaceId(399L)
+//                .nodeId(10345L)
+//                .projectIds(Lists.newArrayList(424L))
                 .build();
 
         MergeMatchDataResp.DataItem dt2 = MergeMatchDataResp.DataItem.builder()
                 .personIds(Lists.newArrayList(9000506L,89636L))
-                .ouId(6158L)
-                .workspaceId(399L)
-                .nodeId(10345L)
-                .projectIds(Lists.newArrayList(763L))
+//                .ouId(6158L)
+//                .workspaceId(399L)
+//                .nodeId(10345L)
+//                .projectIds(Lists.newArrayList(763L))
                 .build();
 
         MergeMatchDataResp matchDataResp = MergeMatchDataResp.builder().dataItems(Lists.newArrayList(dt1, dt2)).build();
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 f303df27..b19d6a1e 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
@@ -392,6 +392,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                 .attach(this.buildAttachUploadFile(visaId)) // 附件
                 .approvalId(visa.getApprovalId()) //最终审批ID
                 .approvalStatus(visa.getApprovalStatus()) //最终审批状态
+                .topic(visa.getTopic()) // 主题
                 .build();
     }