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