hongze hai 7 meses
pai
achega
50aedf1226

+ 1 - 1
controllers/report_author.go

@@ -175,7 +175,7 @@ func (this *ReportAuthorController) EditAuthor() {
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
 	}
-	if otherItem != nil {
+	if otherItem != nil && otherItem.Id > 0 {
 		br.Msg = "已存在该作者名称,请重新输入"
 		br.ErrMsg = "已存在该作者名称,请重新输入"
 		br.IsSendEmail = false

+ 1 - 1
models/data_manage/chart_theme/chart_theme.go

@@ -143,7 +143,7 @@ func GetChartThemeItemList(chartThemeTypeId int) (list []*ChartThemeItem, err er
 	sql := `SELECT a.*,b.default_chart_theme_id FROM chart_theme a
 	    JOIN chart_theme_type b on a.chart_theme_type_id =b.chart_theme_type_id
 	    WHERE a.chart_theme_type_id = ? AND a.is_delete=0 ORDER BY a.chart_theme_id ASC `
-	err = global.DmSQL["data"].Raw(sql).Find(&list).Error
+	err = global.DmSQL["data"].Raw(sql, chartThemeTypeId).Find(&list).Error
 	return
 }