Merge branch 'main' of http://192.168.65.198:3000/toolchaintechnologycenter/spdm-backend

common/src/main/java/com/sdm/common/entity/req/system/LaunchApproveReq.java

@@ -61,4 +61,26 @@ public class LaunchApproveReq extends BaseBean {
 
     @Schema(description = "审批创建时间")
     public String createTime;
+
+    @Override
+    public String toString() {
+        return "LaunchApproveReq{" +
+                "id=" + id +
+                ", cidFlowId='" + cidFlowId + '\'' +
+                ", approveType=" + approveType +
+                ", approveAction=" + approveAction +
+                ", approveContents='" + approveContents + '\'' +
+                ", approveTitle='" + approveTitle + '\'' +
+                ", approveStatus=" + approveStatus +
+                ", comment='" + comment + '\'' +
+                ", tenantId=" + tenantId +
+                ", replyUrl='" + replyUrl + '\'' +
+                ", templateName='" + templateName + '\'' +
+                ", templateId='" + templateId + '\'' +
+                ", replyStatus=" + replyStatus +
+                ", userId=" + userId +
+                ", creator=" + creator +
+                ", createTime='" + createTime + '\'' +
+                '}';
+    }
 }

data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java

@@ -1472,6 +1472,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
 
     @Override
     public SdmResponse approveDataFile(LaunchApproveReq req) {
+        log.info("知识库审批结果req:{}",req);
         // 审批状态
         int approveStatus = req.approveStatus;
         // 审批类型
@@ -2514,6 +2515,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
                 fileMetadataInfo.setTempMetadata(JSONObject.toJSONString(tempFileMetadataInfo));
                 fileMetadataInfo.setUpdateTime(LocalDateTime.now());
                 fileMetadataInfo.setUpdaterId(ThreadLocalContext.getUserId());
+                fileMetadataInfoService.updateById(fileMetadataInfo);
 
                 //发起审批
                 FileApproveRequestBuilder updateFileMetaIntoApproveRequestBuilder = FileApproveRequestBuilder.builder()
@@ -2557,9 +2559,9 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
                 if (CollectionUtils.isNotEmpty(req.getDictTags())) {
                     updateFileTags(req, fileMetadataInfo, dirMetadataInfo);
                 }
+                fileMetadataInfoService.updateById(fileMetadataInfo);
             }
 
-            fileMetadataInfoService.updateById(fileMetadataInfo);
         } else {
             // 需要上传minio新文件，更新文件元数据
             uploadAndUpdateFile(req, fileMetadataInfo, versionNo, fileGroupId,dirMetadataInfo);