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 bd4faa2c..ea9a5c45 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
@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 变洽签关联数据查询入参模型
@@ -25,7 +25,7 @@ public class VisaRelationReq {
     /**
      * 变洽签单据 ID
      */
-    @NotBlank(message = "变洽签单据 ID不能为空")
+    @NotNull(message = "变洽签单据 ID不能为空")
     private Long visaId;
 
     /**
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 c799cef3..36ae9695 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
@@ -2,7 +2,6 @@ package cn.axzo.nanopart.visa.server.controller;
 
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.nanopart.visa.api.changerecord.ChangeRecordRelationApi;
-import cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum;
 import cn.axzo.nanopart.visa.api.request.ChangeRecordAppendAttachReq;
 import cn.axzo.nanopart.visa.api.request.ImGroupOperationReq;
 import cn.axzo.nanopart.visa.api.request.ImGroupTipsQueryReq;
@@ -18,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -36,7 +36,7 @@ public class ChangeRecordRelationController implements ChangeRecordRelationApi {
     public ApiResult<List<VisaRelationResp>> listByVisaId(VisaRelationReq req) {
         return ApiResult.ok(changeRecordRelationService.findByCondition(VisaRelationDto.builder()
                         .visaId(req.getVisaId())
-                        .varName(VisaRelationFieldEnum.PROCESS_INSTANCE_OF_VISA.name())
+                        .varName(Objects.nonNull(req.getFieldEnum()) ? req.getFieldEnum().name() : null)
                         .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/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java
index bc0fafe6..d292a4a2 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java
@@ -24,10 +24,8 @@ import java.util.Date;
 import java.util.Objects;
 
 import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_VAR_VISA_TYPE_KEY;
-import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.APPROVE_COMPLETED;
 import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.REJECT_APPROVE;
 import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.REVERT_APPROVE;
-import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.TO_APPRROVE;
 import static cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum.PROCESS_INSTANCE_OF_VISA;
 
 /**
@@ -159,9 +157,13 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P
                 });
 
         ChangeRecord visa = changeRecordService.getById(visaId);
+        BpmnTaskDelegateAssigner lastOperationAssigner = dto.getLastOperationAssigner();
         if (Objects.equals(resultEnum, BpmnProcessInstanceResultEnum.APPROVED)) {
             changeRecordService.changeStatus(ChangeStatusRequest.builder()
                     .visaId(visaId)
+                    .personId(Long.valueOf(lastOperationAssigner.getPersonId()))
+                    .ouId(Long.valueOf(lastOperationAssigner.getOuId()))
+                    .workspaceId(Long.valueOf(lastOperationAssigner.getTenantId()))
                     .updateStatus(VisaStatusEnum.COMPLETED)
                     .build());
             return;
@@ -169,6 +171,9 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P
         // 回退到待提报或决策中
         changeRecordService.changeStatus(ChangeStatusRequest.builder()
                 .visaId(visaId)
+                .personId(Long.valueOf(lastOperationAssigner.getPersonId()))
+                .ouId(Long.valueOf(lastOperationAssigner.getOuId()))
+                .workspaceId(Long.valueOf(lastOperationAssigner.getTenantId()))
                 .updateStatus(Objects.isNull(visa.getImGroupId()) ? VisaStatusEnum.REPORT_FROM_APPROVE : VisaStatusEnum.DECIDING_FROM_APPROVE)
                 .build());
 
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 4eadbd77..04cd4f59 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
@@ -146,7 +146,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
             return Lists.newArrayList();
         }
         return this.lambdaQuery().eq(ChangeRecordRelation::getVisaId, dto.getVisaId())
-                .eq(ChangeRecordRelation::getVarName, dto.getVarName())
+                .eq(Objects.nonNull(dto.getVarName()), ChangeRecordRelation::getVarName, dto.getVarName())
                 .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())
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 3293339d..631c6963 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
@@ -1643,6 +1643,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
 
         changeStatus(ChangeStatusRequest.builder()
                 .visaId(req.getVisaId())
+                .personId(req.getOperatorPersonId())
+                .ouId(req.getOperatorOuId())
+                .workspaceId(req.getOperatorWorkspaceId())
                 .updateStatus(VisaStatusEnum.EXECUTING)
                 .build());
     }