解决多数据集显示顺序错乱问题。

Signed-off-by: zouap <zouap@pcl.ac.cn>

routers/repo/modelarts.go

@@ -896,12 +896,12 @@ func trainJobNewVersionDataPrepare(ctx *context.Context) error {
 	ctx.Data["display_job_name"] = task.DisplayJobName
 	ctx.Data["job_name"] = task.JobName
 
-	attachs, err := models.GetModelArtsTrainAttachments(ctx.User.ID)
-	if err != nil {
-		ctx.ServerError("GetAllUserAttachments failed:", err)
-		return err
-	}
-	ctx.Data["attachments"] = attachs
+	// attachs, err := models.GetModelArtsTrainAttachments(ctx.User.ID)
+	// if err != nil {
+	// 	ctx.ServerError("GetAllUserAttachments failed:", err)
+	// 	return err
+	// }
+	// ctx.Data["attachments"] = attachs
 
 	var resourcePools modelarts.ResourcePool
 	if err = json.Unmarshal([]byte(setting.ResourcePools), &resourcePools); err != nil {
@@ -945,12 +945,16 @@ func trainJobNewVersionDataPrepare(ctx *context.Context) error {
 		ctx.ServerError("GetBranches error:", err)
 		return err
 	}
-
+	_, _, datasetNames, _, err := getDatasUrlListByUUIDS(task.Uuid)
+	if err != nil {
+		ctx.ServerError("GetAllUserAttachments failed:", err)
+		return err
+	}
 	ctx.Data["branches"] = branches
 	ctx.Data["branch_name"] = task.BranchName
 	ctx.Data["description"] = task.Description
 	ctx.Data["boot_file"] = task.BootFile
-	ctx.Data["dataset_name"] = task.DatasetName
+	ctx.Data["dataset_name"] = datasetNames
 	ctx.Data["work_server_number"] = task.WorkServerNumber
 	ctx.Data["flavor_name"] = task.FlavorName
 	ctx.Data["engine_name"] = task.EngineName
@@ -2708,11 +2712,23 @@ func getDatasUrlListByUUIDS(uuidStr string) ([]models.Datasurl, string, string,
 
 	datasetInfos := make(map[string]models.DatasetInfo)
 	attachs, err := models.GetAttachmentsByUUIDs(uuids)
-	if err != nil {
+	if err != nil || len(attachs) != len(uuids) {
 		log.Error("GetAttachmentsByUUIDs failed: %v", err)
 		return datasUrlList, dataUrl, datasetNames, isMultiDataset, errors.New("GetAttachmentsByUUIDs failed")
 	}
-	for i, attach := range attachs {
+
+	for i, tmpUuid := range uuids {
+		var attach *models.Attachment
+		for _, tmpAttach := range attachs {
+			if tmpAttach.UUID == tmpUuid {
+				attach = tmpAttach
+				break
+			}
+		}
+		if attach == nil {
+			log.Error("GetAttachmentsByUUIDs failed: %v", err)
+			return datasUrlList, dataUrl, datasetNames, isMultiDataset, errors.New("GetAttachmentsByUUIDs failed")
+		}
 		fileName := strings.TrimSuffix(strings.TrimSuffix(strings.TrimSuffix(attach.Name, ".zip"), ".tar.gz"), ".tgz")
 		for _, datasetInfo := range datasetInfos {
 			if fileName == datasetInfo.Name {