From cf54fc64b0d66b7ab981bce60c1f3b581ebc4042 Mon Sep 17 00:00:00 2001
From: yangyang <yangyang1@honeycombis.com>
Date: Wed, 11 Mar 2026 09:42:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A1.=E7=9F=A5=E8=AF=86?=
 =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=81=E6=80=A7=EF=BC=8C=E5=BD=93=E5=89=8D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BA=BA=E8=83=BD=E6=9F=A5=E5=88=B0=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E5=AE=A1=E6=89=B9=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=88=AB=E4=BA=BA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=88=96=E5=88=A0=E9=99=A4=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=98?=
 =?UTF-8?q?=E6=98=AF=E5=AE=A1=E6=89=B9=E5=AE=8C=E6=88=90=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E4=BF=AE=E6=94=B9=E4=BA=BA=E7=9A=84=E6=98=AF=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MinioFileIDataFileServiceImpl.java      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
index 42ccb15d..64269a4f 100644
--- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
@@ -952,6 +952,14 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
         if(CollectionUtils.isNotEmpty(files)){
             files.stream().forEach(x -> {
                 x.setApprovalStatus(ApproveFileDataTypeEnum.getStatusStr(x.getApproveType()));
+                // 假如是pending 数据创建人和当前查询人不是一个人，则这是操作修改或者删除了，对于当前查询人展示的就是未变更的数据，那就是审核完成状态
+                if(!Objects.isNull(userId)){
+                    if(Objects.equals(x.getApprovalStatus(), ApprovalFileDataStatusEnum.PENDING.getKey())&&
+                            !Objects.equals(userId,x.getCreatorId())){
+                        // 完成态
+                        x.setApprovalStatus("approved");
+                    }
+                }
             });
         }
         setCreatorNames(files);
@@ -1138,6 +1146,14 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
             dto.setKnowledgeBaseName(knowledgeBaseName);
             // 设置审批状态
             dto.setApprovalStatus(ApproveFileDataTypeEnum.getStatusStr(entity.getApproveType()));
+            // 假如是pending 数据创建人和当前查询人不是一个人，则这是操作修改或者删除了，对于当前查询人展示的就是未变更的数据，那就是审核完成状态
+            if(!Objects.isNull(userId)){
+                if(Objects.equals(dto.getApprovalStatus(), ApprovalFileDataStatusEnum.PENDING.getKey())&&
+                        !Objects.equals(userId,entity.getCreatorId())){
+                    // 完成态
+                    dto.setApprovalStatus("approved");
+                }
+            }
             return dto;
         }).collect(Collectors.toList());