fix：默认主题的问题

controllers/data_manage/chart_theme.go

@@ -444,9 +444,9 @@ func (c *ChartThemeController) Delete() {
 	}
 
 	// 判断是否是配置为默认设置，如果已经设置了，那么不能删除
-	if chartThemeType.DefaultChartThemeId == 1 {
-		br.Msg = "该主题已经配置为默认设置，无法删除"
-		br.ErrMsg = "该主题已经配置为默认设置，无法删除"
+	if chartThemeType.DefaultChartThemeId == chartTheme.ChartThemeId {
+		br.Msg = "该主题已经配置为默认设置，不允许删除"
+		br.ErrMsg = "该主题已经配置为默认设置，不允许删除"
 		br.IsSendEmail = false
 		return
 	}

models/data_manage/chart_theme/chart_theme_default_data.go

@@ -57,12 +57,17 @@ func (m *ChartThemeDefaultData) Update(cols []string) (err error) {
 // @param endInfoId int
 // @return list []*ChartThemeDefaultDataItem
 // @return err error
-func GetChartThemeDefaultDataItemList(endInfoId int) (list []*data_manage.EdbDataList, err error) {
+func GetChartThemeDefaultDataItemList(endInfoId int, startDate string) (list []*data_manage.EdbDataList, err error) {
 	sql := `SELECT edb_data_id,edb_info_id,data_time,value,data_timestamp FROM chart_theme_default_data WHERE edb_info_id=? `
+	var pars []interface{}
+	if startDate != "" {
+		sql += ` AND data_time>=? `
+		pars = append(pars, startDate)
+	}
 
 	sql += ` ORDER BY data_time ASC `
 	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, endInfoId).QueryRows(&list)
+	_, err = o.Raw(sql, endInfoId, pars).QueryRows(&list)
 	return
 }
 

services/data/chart_theme.go

@@ -200,7 +200,7 @@ func getThemePreviewEdbDataMapList(chartType int, calendar, startDate, endDate s
 		}
 
 		dataList := make([]*data_manage.EdbDataList, 0)
-		dataList, err = chart_theme.GetChartThemeDefaultDataItemList(v.EdbInfoId)
+		dataList, err = chart_theme.GetChartThemeDefaultDataItemList(v.EdbInfoId, startDateReal)
 		if err != nil {
 			return
 		}