diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java
index 3dec4078..6ad2d56f 100644
--- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java
@@ -357,7 +357,12 @@ public class VisaDetailByIdResponse {
             if (CollectionUtils.isEmpty(professionalList)) {
                 return Lists.newArrayList();
             }
-            return professionalList;
+
+            List<RelationProfessionalDetail> filter = professionalList.stream().filter(item -> Objects.nonNull(item) && StringUtils.isNotBlank(item.getCode())).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(filter)) {
+                return Lists.newArrayList();
+            }
+            return filter;
         }
 
         /**
@@ -407,7 +412,11 @@ public class VisaDetailByIdResponse {
             if (CollectionUtils.isEmpty(relationAreaList)) {
                 return Lists.newArrayList();
             }
-            return relationAreaList;
+            List<RelationAreaDetail> filter = relationAreaList.stream().filter(item -> Objects.nonNull(item) && Objects.nonNull(item.getAreaId())).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(filter)) {
+                return Lists.newArrayList();
+            }
+            return filter;
         }
 
         public static List<Long> buildAreaWithId(JSONArray relationArea) {
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
index 73a78bfe..11e5c782 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
@@ -87,8 +87,8 @@ public class ChangeRecordController implements ChangeRecordApi {
     @Override
     public ApiResult<VisaDetailByIdResponse> visaDetailById(@RequestBody @Valid VisaDetailByIdRequest req) {
         VisaDetailByIdResponse resp = changeRecordService.detailById(req.getVisaId());
-        resp.setBtnList(VisaButtonTypeEnum.all());
-//        resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus()));
+//        resp.setBtnList(VisaButtonTypeEnum.all());
+        resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus()));
         return ApiResult.ok(resp);
     }