Roc 2 nedēļas atpakaļ
vecāks
revīzija
fcb6080cff
2 mainītis faili ar 6 papildinājumiem un 3 dzēšanām
  1. 4 1
      models/permission.go
  2. 2 2
      services/ppt.go

+ 4 - 1
models/permission.go

@@ -43,7 +43,10 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 			_ = to.Commit()
 		}
 	}()
-	sql := "DELETE FROM chart_permission_search_key_word_mapping AS a WHERE a.from = 'rddp' AND a.classify_id = ?"
+	sql := "DELETE FROM chart_permission_search_key_word_mapping WHERE from = 'rddp' AND classify_id = ?"
+	if utils.DbDriverName == `dm` {
+		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 {

+ 2 - 2
services/ppt.go

@@ -295,7 +295,7 @@ func ResetPPTReport(reportId int, isEnglish bool) (err error) {
 			err = errors.New("获取英文PPT失败, Err: " + e.Error())
 			return
 		}
-		if en != nil {
+		if en != nil && en.PptId > 0 {
 			updateCols := []string{"ReportId", "ReportCode"}
 			en.ReportId = 0
 			en.ReportCode = ""
@@ -313,7 +313,7 @@ func ResetPPTReport(reportId int, isEnglish bool) (err error) {
 		err = errors.New("获取PPT失败, Err: " + e.Error())
 		return
 	}
-	if item != nil {
+	if item != nil && item.PptId > 0 {
 		updateCols := []string{"ReportId", "ReportCode"}
 		item.ReportId = 0
 		item.ReportCode = ""