fix: gorm

controllers/data_manage/multiple_graph_config.go

@@ -681,6 +681,9 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
 		br.ErrMsg = "获取配置与图表的关联关系失败，ERR:" + err.Error()
 		return
 	}
+	if multipleGraphConfigChartMapping != nil && multipleGraphConfigChartMapping.Id <= 0 {
+		multipleGraphConfigChartMapping = nil
+	}
 
 	err = nil
 	var isAdd bool
@@ -695,7 +698,7 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
 			return
 		}
 		// 说明图还在，没有被删除
-		if chartInfo != nil {
+		if chartInfo != nil && chartInfo.ChartInfoId > 0 {
 			chartInfoId = multipleGraphConfigChartMapping.ChartInfoId
 			req.ChartName = chartInfo.ChartName
 			req.ClassifyId = chartInfo.ChartClassifyId
@@ -1280,6 +1283,10 @@ func (this *ChartInfoController) MultipleGraphConfigSaveEdb() {
 		br.ErrMsg = "获取配置与图表的关联关系失败，ERR:" + err.Error()
 		return
 	}
+	if multipleGraphConfigEdbMapping != nil && multipleGraphConfigEdbMapping.Id <= 0 {
+		multipleGraphConfigEdbMapping = nil
+	}
+
 	err = nil
 	var isAdd bool
 	var edbInfoId int
@@ -1293,7 +1300,7 @@ func (this *ChartInfoController) MultipleGraphConfigSaveEdb() {
 			return
 		}
 		// 说明指标还在，没有被删除
-		if edbInfo != nil && !req.IsSaveAs {
+		if edbInfo != nil && edbInfo.EdbInfoId > 0 && !req.IsSaveAs {
 			edbInfoId = multipleGraphConfigEdbMapping.EdbInfoId
 			req.EdbName = edbInfo.EdbName
 			req.ClassifyId = edbInfo.ClassifyId

controllers/speech_recognition/speech_recognition_menu.go

@@ -241,6 +241,12 @@ func (this *SpeechRecognitionMenuController) Remove() {
 		br.ErrMsg = "获取目录失败, Err: " + e.Error()
 		return
 	}
+	if menuItem != nil && menuItem.SpeechRecognitionMenuId <= 0 {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "操作成功"
+		return
+	}
 
 	// 删除校验
 	checkResult, menuIds, e := services.CheckSpeechRecognitionMenuRemove(menuItem.SpeechRecognitionMenuId)

models/data_manage/edb_info_relation.go

@@ -3,6 +3,7 @@ package data_manage
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+	"gorm.io/gorm"
 	"time"
 
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -242,6 +243,15 @@ type BaseRelationEdbInfo struct {
 	RelationTime    string `description:"引用时间"`
 }
 
+func (obj *BaseRelationEdbInfo) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if obj.RelationTime != "" {
+			obj.RelationTime = utils.GormDateStrToDateStr(obj.RelationTime)
+		}
+	}
+	return
+}
+
 type BaseRelationEdbInfoResp struct {
 	Paging *paging.PagingItem
 	List   []*BaseRelationEdbInfo

models/en_permission.go

@@ -11,7 +11,7 @@ import (
 )
 
 type EnPermission struct {
-	EnPermissionId   int       `gorm:"column:id;primaryKey;autoIncrement" description:"英文品种权限ID"`
+	EnPermissionId   int       `gorm:"primaryKey;autoIncrement" description:"英文品种权限ID"`
 	EnPermissionName string    `description:"品种权限名称"`
 	CnPermissionName string    `description:"对应的中文权限名称"`
 	ParentId         int       `description:"父级ID"`

models/material/material.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -82,6 +83,18 @@ type MaterialListItems struct {
 	//ParentIds  string
 }
 
+func (obj *MaterialListItems) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if obj.CreateTime != "" {
+			obj.CreateTime = utils.GormDateStrToDateTimeStr(obj.CreateTime)
+		}
+		if obj.ModifyTime != "" {
+			obj.ModifyTime = utils.GormDateStrToDateTimeStr(obj.ModifyTime)
+		}
+	}
+	return
+}
+
 func GetMaterialListPageByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*MaterialListItems, err error) {
 	o := global.DbMap[utils.DbNameReport]
 	sql := ` SELECT * FROM material WHERE 1=1 `

models/permission.go

@@ -43,7 +43,7 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 			_ = to.Commit()
 		}
 	}()
-	sql := "DELETE FROM chart_permission_search_key_word_mapping WHERE from = 'rddp' AND classify_id = ?"
+	sql := "DELETE FROM chart_permission_search_key_word_mapping AS a WHERE a.from = 'rddp' AND a.classify_id = ?"
 	sql = utils.ReplaceDriverKeywords("", sql)
 	err = to.Exec(sql, classifyId).Error
 	if err != nil {
@@ -99,7 +99,7 @@ func GetChartPermissionNameFromMappingByKeyword(source string, classifyId int) (
 // UpdateChartPermissionNameFromMappingByKeyword 根据关键词及来源更新新关键词
 func UpdateChartPermissionNameFromMappingByKeyword(newKeyword string, classifyId int, source string) (err error) {
 	o := global.DbMap[utils.DbNameReport]
-	sql := " UPDATE chart_permission_search_key_word_mapping SET key_word = ? WHERE classify_id = ? AND from = ? "
+	sql := " UPDATE chart_permission_search_key_word_mapping AS a SET a.key_word = ? WHERE a.classify_id = ? AND a.from = ? "
 	sql = utils.ReplaceDriverKeywords("", sql)
 	err = o.Exec(sql, newKeyword, classifyId, source).Error
 	return

models/speech_recognition/speech_recognition_menu.go

@@ -80,7 +80,7 @@ func (m *SpeechRecognitionMenu) Update(cols []string) (err error) {
 func (m *SpeechRecognitionMenu) Del() (err error) {
 	o := global.DbMap[utils.DbNameMaster]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, m.SpeechRecognitionMenuId).Error
+	err = o.Exec(sql, m.SpeechRecognitionMenuId).Error
 	return
 }
 
@@ -90,7 +90,7 @@ func (m *SpeechRecognitionMenu) MultiDel(menuIds []int) (err error) {
 	}
 	o := global.DbMap[utils.DbNameMaster]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	err = o.Raw(sql, menuIds).Error
+	err = o.Exec(sql, menuIds).Error
 	return
 }
 

utils/sql.go

@@ -329,13 +329,9 @@ func ReplaceDriverKeywords(driver string, sql string) string {
 			"admin":    `"admin"`,
 			"value":    `"value"`,
 			"exchange": `"exchange"`,
-			"b.from":   `b."from"`,
 			"size":     `"size"`,
 			"a.from":   `a."from"`,
-			"from":     `"from"`,
-		},
-		MySql: {
-			"from": "`from`",
+			"b.from":   `b."from"`,
 		},
 	}
 	replacements, ok := rules[dbDriver]