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());