Merge branch 'feature/eta_forum3_chart_classify' of eta_forum/eta_forum_hub into master

models/chart_description.go

@@ -81,8 +81,8 @@ func BatchUpdateChartDescription(chartInfoId int, descriptionList []*ChartDescri
 		delete(deleteIdMap, desc.Id)
 		if _, exists := existingRecords[desc.Id]; exists {
 			// 更新
-			sql := "UPDATE chart_description SET description = ?, sys_user_id = ?, sys_user_real_name = ?, modify_time = ? WHERE id = ?"
-			_, err = tx.Raw(sql, desc.Description, desc.SysUserId, desc.SysUserRealName, desc.ModifyTime, desc.Id).Exec()
+			sql := "UPDATE chart_description SET description = ?, sys_user_id = ?, sys_user_real_name = ?, create_time = ?, modify_time = ? WHERE id = ?"
+			_, err = tx.Raw(sql, desc.Description, desc.SysUserId, desc.SysUserRealName, desc.CreateTime, desc.ModifyTime, desc.Id).Exec()
 			if err != nil {
 				return err
 			}

services/chart_info.go

@@ -776,11 +776,11 @@ func addOrUpdateChartDescriptionList(chartInfoId int, reqDescription []*models.C
 			err = errors.New("获取创建人信息失败,Err:" + e.Error())
 			return
 		}
-		for _, v := range reqDescription {
-			for _, admin := range adminList {
-				oldAdminIdMap[v.AdminName] = admin.AdminId
-			}
+		
+		for _, val := range adminList {
+			oldAdminIdMap[val.AdminName] = val.AdminId
 		}
+		
 	}
 	
 	for _, v := range reqDescription {
@@ -790,12 +790,13 @@ func addOrUpdateChartDescriptionList(chartInfoId int, reqDescription []*models.C
 			v.SysUserId = 0
 		}
 		descriptionList = append(descriptionList, &models.ChartDescription{
+			Id: v.Id,
 			ChartInfoId: chartInfoId,
 			Description: v.Description,
 			SysUserId: v.SysUserId,
-			SysUserRealName: v.AdminName,
-			ModifyTime: time.Now(),
-			CreateTime: time.Now(),
+			SysUserRealName: v.SysUserRealName,
+			ModifyTime: v.ModifyTime,
+			CreateTime: v.CreateTime,
 		})
 	}
 	err = models.BatchUpdateChartDescription(chartInfoId, descriptionList)