From 057dab91881f382d35847230fc480e9df5b7454c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= <lilong@axzo.cn>
Date: Thu, 20 Feb 2025 16:26:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:(feature/REQ-3581)=20visaRelation=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0id=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/axzo/nanopart/visa/api/request/VisaRelationReq.java    | 2 ++
 .../server/controller/ChangeRecordRelationController.java     | 1 +
 .../cn/axzo/nanopart/visa/server/dto/VisaRelationDto.java     | 1 +
 .../server/service/impl/ChangeRecordRelationServiceImpl.java  | 4 +++-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java
index ea9a5c45..17e465bf 100644
--- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java
@@ -33,4 +33,6 @@ public class VisaRelationReq {
      * 可为空，则查询所有关联的数据
      */
     private VisaRelationFieldEnum fieldEnum;
+
+    private Long id;
 }
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java
index ac34849c..ef800c87 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java
@@ -37,6 +37,7 @@ public class ChangeRecordRelationController implements ChangeRecordRelationApi {
         return ApiResult.ok(changeRecordRelationService.findByCondition(VisaRelationDto.builder()
                         .visaId(req.getVisaId())
                         .varName(Objects.nonNull(req.getFieldEnum()) ? req.getFieldEnum().name() : null)
+                        .id(req.getId())
                         .build())
                 .stream().sorted(Comparator.comparing(ChangeRecordRelation::getCreateAt))
                 .map(i -> VisaRelationResp.builder()
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaRelationDto.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaRelationDto.java
index 69d40f88..c87092ce 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaRelationDto.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/dto/VisaRelationDto.java
@@ -43,4 +43,5 @@ public class VisaRelationDto {
      */
     private Long createBy;
 
+    private Long id;
 }
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 04cd4f59..e510240c 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
@@ -150,7 +150,9 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
                 .eq(StringUtils.hasText(dto.getContent()), ChangeRecordRelation::getContent, dto.getContent())
                 .eq(StringUtils.hasText(dto.getContentExt()), ChangeRecordRelation::getContentExt, dto.getContentExt())
                 .eq(Objects.nonNull(dto.getCreateBy()), ChangeRecordRelation::getCreateBy, dto.getCreateBy())
-                .eq(ChangeRecordRelation::getIsDelete, 0).list();
+                .eq(ChangeRecordRelation::getIsDelete, 0)
+                .eq(Objects.nonNull(dto.getId()), ChangeRecordRelation::getId, dto.getId())
+                .list();
     }
 
     @Override