修复创建公开数据集模型bug

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

@@ -567,7 +567,7 @@ public class ModelsServiceImpl implements ModelsService {
             Map<String, Object> userInfo = getUserInfo(ci4sUsername, gitLinkUsername, gitLinkPassword);
             Integer userId = (Integer) userInfo.get("user_id");
 
-            ci4sUsername = modelsVo.getIsPublic() ? Constant.Item_Public : ci4sUsername;
+            ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : ci4sUsername;
             String repositoryName = modelsVo.getIdentifier() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getIdentifier();
             ModelDependency1 modelDependency = new ModelDependency1();
             List<ModelDependency1> oldModelDependencys = modelDependency1Dao.queryModelDependency(modelsVo.getName(), null, gitLinkUsername);
@@ -695,7 +695,7 @@ public class ModelsServiceImpl implements ModelsService {
         String gitLinkPassword = decrypt(loginUser.getSysUser().getGitLinkPassword());
         Map<String, Object> userInfo = getUserInfo(ci4sUsername, gitLinkUsername, gitLinkPassword);
 
-        ci4sUsername = modelsVo.getIsPublic() ? Constant.Item_Public : loginUser.getUsername();
+        ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
         String repositoryName = modelsVo.getIdentifier() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getIdentifier();
         ModelDependency1 modelDependency = new ModelDependency1();
         List<ModelDependency1> oldModelDependencys = modelDependency1Dao.queryModelDependency(modelsVo.getName(), modelsVo.getId(), gitLinkUsername);

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

@@ -8,7 +8,6 @@ import com.ruoyi.platform.domain.AssetWorkflow;
 import com.ruoyi.platform.domain.AutoMl;
 import com.ruoyi.platform.domain.Dataset;
 import com.ruoyi.platform.domain.DatasetTempStorage;
-import com.ruoyi.platform.domain.dependencydomain.TrainTaskDepency;
 import com.ruoyi.platform.mapper.AssetWorkflowDao;
 import com.ruoyi.platform.mapper.AutoMlDao;
 import com.ruoyi.platform.service.DatasetTempStorageService;
@@ -102,7 +101,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
         Integer userId = (Integer) userInfo.get("user_id");
         // 拼接project
-        ci4sUsername = datasetVo.getIsPublic() ? Constant.Item_Public : loginUser.getUsername();
+        ci4sUsername = Boolean.TRUE.equals(datasetVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
         String repositoryName = ci4sUsername + "_dataset_" + DateUtils.dateTimeNow();
         GitProjectVo gitProjectVo = new GitProjectVo();
         gitProjectVo.setRepositoryName(repositoryName);
@@ -206,7 +205,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername();
         String gitLinkPassword = decrypt(loginUser.getSysUser().getGitLinkPassword());
         String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
-        ci4sUsername = datasetVo.getIsPublic() ? Constant.Item_Public : loginUser.getUsername();
+        ci4sUsername = Boolean.TRUE.equals(datasetVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
         Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
         // 创建分支
         String branchName = StringUtils.isEmpty(datasetVo.getVersion()) ? "master" : datasetVo.getVersion();
@@ -419,7 +418,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         HashMap<String, String> map = new HashMap<>();
         map.put("id", String.valueOf(repoId));
         List<AutoMl> autoMlList = autoMlDao.queryByDatasetId(JSON.toJSONString(map));
-        if(autoMlList !=null && !autoMlList.isEmpty()) {
+        if (autoMlList != null && !autoMlList.isEmpty()) {
             String autoMls = String.join(",", autoMlList.stream().map(AutoMl::getMlName).collect(Collectors.toSet()));
             throw new Exception("该数据集被自动机器学习：" + autoMls + "使用，不能删除，请先删除自动机器学习。");
         }
@@ -444,7 +443,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         map.put("id", String.valueOf(repoId));
         map.put("version", version);
         List<AutoMl> autoMlList = autoMlDao.queryByDatasetId(JSON.toJSONString(map));
-        if(autoMlList !=null && !autoMlList.isEmpty()) {
+        if (autoMlList != null && !autoMlList.isEmpty()) {
             String autoMls = String.join(",", autoMlList.stream().map(AutoMl::getMlName).collect(Collectors.toSet()));
             throw new Exception("该数据集版本被自动机器学习：" + autoMls + "使用，不能删除，请先删除自动机器学习。");
         }