数据集审批bug修复

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java

@@ -18,6 +18,7 @@ import com.ruoyi.system.api.model.LoginUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -50,6 +51,7 @@ public class ApprovalServiceImpl implements ApprovalService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void approve(ApprovalRequest approval) throws Exception {
         approval.setStatus(ApprovalStatus.APPROVED.getCode());
         //更改审批单状态

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

@@ -1412,7 +1412,7 @@ public class ModelsServiceImpl implements ModelsService {
             LoginUser loginUser = SecurityUtils.getLoginUser();
             String ci4sUsername = loginUser.getUsername();
             String repositoryName = modelsVo.getIdentifier();
-            String branchName = modelsVo.getVersion();
+            String branchName = StrUtil.toString(branch.get("name"));
             String relatePath = ci4sUsername + "/model/" + modelsVo.getId() + "/" + repositoryName + "/" + branchName;
             String rootPath = localPath + relatePath;
             String metaPath = rootPath + "/metadata";
@@ -1421,7 +1421,7 @@ public class ModelsServiceImpl implements ModelsService {
         Map projectDetail = gitService.getProjectDetail(modelsVo.getOwner(), modelsVo.getIdentifier(), token);
         Map<String, Object> param = new HashMap<>();
         param.put("id", projectDetail.get("project_id"));
-        param.put("is_public", true);
+        param.put("private", false);
         gitService.updateProjectDetail(param, modelsVo.getOwner(), modelsVo.getIdentifier(), token);
     }
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java

@@ -814,7 +814,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         Map projectDetail = gitService.getProjectDetail(newDatasetVo.getOwner(), newDatasetVo.getIdentifier(), token);
         Map<String, Object> param = new HashMap<>();
         param.put("id", projectDetail.get("project_id"));
-        param.put("is_public", true);
+        param.put("private", false);
         gitService.updateProjectDetail(param, newDatasetVo.getOwner(), newDatasetVo.getIdentifier(), token);
     }