@@ -700,7 +700,7 @@ func EditReportClassify(classifyId int, classifyName string, chartPermissionIdLi
err = errors.New("获取重名分类失败, Err: " + err.Error())
return
}
- if existName != nil && existName.Id != item.Id {
+ if existName != nil && existName.Id > 0 && existName.Id != item.Id {
errMsg = "分类名称:" + classifyName + "已存在"
err = errors.New(errMsg)
isSendEmail = false
@@ -277,7 +277,7 @@ func RenameEnglishGroupName(groupId int64, groupName string, adminId int) (err e
err = errors.New("目录查询出错:" + err.Error())
- if item != nil {
+ if item != nil && item.GroupId > 0 {
err = errors.New("目录名称已存在,不可重复添加")
@@ -447,7 +447,7 @@ func RenameGroupName(groupId int64, groupName string, adminId int) (err error) {
@@ -332,6 +332,7 @@ func ReplaceDriverKeywords(driver string, sql string) string {
"b.from": `b."from"`,
"size": `"size"`,
"a.from": `a."from"`,
+ "from": `"from"`,
},
MySql: {
"from": "`from`",